比较提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
5fe4b1933e | ||
|
|
a4a1f8b08b | ||
|
|
1cc7f8edb2 | ||
|
|
48ac192d4b | ||
|
|
ca4abaf2c3 | ||
|
|
38f15ec1fe | ||
|
|
1575cb1191 | ||
|
|
a03a056bff | ||
|
|
edfbcd540b | ||
|
|
d018769558 | ||
|
|
e26a7c68e4 | ||
|
|
2b2a98d665 | ||
|
|
ecadafd8c3 | ||
|
|
ae0a64ec84 | ||
|
|
31a4d0cd15 |
没有与搜索条件相匹配的文件
+4
-2
@@ -17,11 +17,13 @@ SOURCE_BACKUP=大鱼调色仓库 Backend/
|
||||
|
||||
## 客户端
|
||||
|
||||
主 APP 检查更新与插件注册并行,检查结束且注册成功后显示3秒退出倒计时。发现更新则保留窗口;下载可取消,校验 SHA-256、字节数、Installer/App签名团队、Gatekeeper、包内 Bundle ID、版本、安装位置及模板。保存并退出 FCP/Motion 后打开系统安装器,不强杀宿主。下一次启动可记录已完成升级。
|
||||
主 APP 检查更新与插件注册并行,注册后保持运行,关闭窗口后仍在后台收集诊断;菜单栏可重新打开或明确退出。发现更新会显示提示;下载可取消,校验 SHA-256、字节数、Installer/App签名团队、Gatekeeper、包内 Bundle ID、版本、安装位置及模板。保存并退出 FCP/Motion 后打开系统安装器,不强杀宿主。下一次启动可记录已完成升级。
|
||||
|
||||
主 APP 与 XPC 共享随机安装标识及诊断开关。诊断默认开启,界面明确说明并可关闭;不上传素材、LUT、预设、用户路径、账号、硬件 UUID 或原始崩溃文件。后台私有队列最多256条/384KB,批次16条,网络超时并延迟重试,服务端按事件 UUID 去重。关闭后清除待发摘要并停止新请求;已经送达的数据按保留期清理。
|
||||
|
||||
采集进程启动、初始化、检查器创建/慢刷新、Metal 管线准备、首次渲染、渲染错误、超过6秒的疑似阻塞,以及本插件近7天系统崩溃报告的脱敏摘要。疑似阻塞不等于根因;整个进程被停止、网络不可用、主机强制断电时无法保证即时送达。不会拦截崩溃信号,也不采集整个 FCP 的报告。本轮保留调色与宿主回调逻辑,尚未修复偶发卡死。
|
||||
1.18.0(104)起每分钟汇总进程内存/CPU/线程数和渲染、参数读取、跟踪帧耗时;慢于100ms的单次事件最多每阶段30秒一条。超过6秒的疑似阻塞附当前阶段,并限频调用系统 sample 采样本进程1秒(间隔至少120秒,每小时最多6次,8秒超时,失败明确标记);仅提取调用栈,临时原文随即删除。主运行循环使用公共模式脉冲,避免正常菜单/模态循环被主队列探针误报。
|
||||
|
||||
主 APP 每分钟扫描本产品 APP 和 XPC 近7天 IPS,补采终止后的待发送队列;不要求用户重启主 APP。崩溃摘要记录故障实际版本/build、终止类别、故障线程的镜像UUID与偏移;排除自检和 ASAN 记录。已送达报告本地去重,云端继续按事件UUID去重。疑似阻塞不等于根因;整个进程被停止、网络不可用、主机强制断电时无法保证即时送达。不会拦截崩溃信号,也不采集整个 FCP 的报告;整个进程完全无法调度时,内部采样无法运行,须依靠系统生成的后续报告。本轮保留调色与宿主回调逻辑,尚未修复偶发卡死。
|
||||
|
||||
## 验证与发布
|
||||
|
||||
|
||||
+1
-1
@@ -75,7 +75,7 @@ def main():
|
||||
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 后安装。')
|
||||
notes='优化蒙版与马赛克跟踪:减少 Metal 灰度回读,复用光流计算数据;减少参数与图层列表重复刷新。转身和遮挡后的目标偏移仍需人工检查。保留可关闭的后台自动诊断。安装前请保存工作并正常退出 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)
|
||||
|
||||
@@ -38,6 +38,9 @@ try {
|
||||
$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');
|
||||
$newFields=array('source_build'=>'104','process_role'=>'plugin','termination_namespace'=>'DYLD','termination_code'=>1,'memory_mb'=>512,'cpu_percent'=>120,'thread_count'=>32,'resource_kind'=>'cube','pid'=>123,'width'=>3840,'height'=>2160,'sample_status'=>'captured','frames'=>'DYRenderer | image + 32 | UUID');
|
||||
check(Dayu_Color_Beta::clean_fields($newFields)==$newFields,'new evidence fields survive server normalization');
|
||||
foreach(array('render','plugin_state','tracking_frame','process_health','performance_summary','hang_sample') as $name){$b=$body;$b['events'][0]['event']=$name;$b['events'][0]['fields']=$newFields;check(Dayu_Color_Beta::ingest(request($b))->status===200,'new event accepted '.$name);}
|
||||
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');
|
||||
|
||||
+3
-2
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Anonymous public-beta endpoint smoke test; no credentials or production settings."""
|
||||
import datetime,json,time,urllib.request,urllib.error,uuid
|
||||
import datetime,json,time,urllib.request,urllib.error,uuid,plistlib
|
||||
from pathlib import Path
|
||||
ROOT=Path(__file__).resolve().parent.parent
|
||||
BASE='https://dayu.media/wp-json/dayu-color/v1/'
|
||||
@@ -14,7 +14,8 @@ def main():
|
||||
assert call('update?bundle_id=other&channel=beta')[0]==400
|
||||
assert call('diagnostics')[0] in (401,403)
|
||||
event_id=str(uuid.uuid4());installation=str(uuid.uuid4());session=str(uuid.uuid4())
|
||||
event=dict(event_id=event_id,session_id=session,source='app',version='1.7.0',build=45,event='diagnostic_summary',occurred_at=time.time(),fields={'status':'deployment_smoke_test','count':1})
|
||||
info=plistlib.loads((ROOT/'大鱼调色/Wrapper Application/Info.plist').read_bytes())
|
||||
event=dict(event_id=event_id,session_id=session,source='app',version=info['CFBundleShortVersionString'],build=int(info['CFBundleVersion']),event='hang_sample',occurred_at=time.time(),fields={'status':'deployment_smoke_test','phase':'verification','sample_status':'contract_only','count':1})
|
||||
payload=dict(bundle_id='com.dayu.color',installation_id=installation,events=[event])
|
||||
for attempt in range(2):
|
||||
status,reply=call('diagnostics',payload);assert status==200 and reply['accepted'] and reply['event_ids']==[event_id],(status,reply)
|
||||
|
||||
@@ -12,10 +12,10 @@ final class Dayu_Color_Beta {
|
||||
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');
|
||||
'render','plugin_state','tracking_frame','process_health','performance_summary','hang_sample','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');
|
||||
'cpu_cores','memory_gb','gpu','main_delay_ms','active_stages','source_version','source_build','process_role','termination_namespace','termination_code','pid','resource_kind','memory_mb','cpu_percent','thread_count','uptime_s','max_duration_ms','average_ms','width','height','layer_count','mask_count','sample_status');
|
||||
|
||||
public static function boot() {
|
||||
add_action('rest_api_init', array(__CLASS__, 'routes'));
|
||||
@@ -90,7 +90,7 @@ final class Dayu_Color_Beta {
|
||||
$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 (in_array($key,array('duration_ms','main_delay_ms','memory_gb','cpu_cores','count','pending','error_code','pid','termination_code','memory_mb','cpu_percent','thread_count','uptime_s','max_duration_ms','average_ms','width','height','layer_count','mask_count'),true)) {
|
||||
if (is_numeric($input[$key]) && is_finite((float)$input[$key])) $out[$key]=max(-1000000,min(86400000,(float)$input[$key]));
|
||||
continue;
|
||||
}
|
||||
@@ -165,15 +165,17 @@ final class Dayu_Color_Beta {
|
||||
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>';
|
||||
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>';
|
||||
$fields=json_decode($row['fields_json'],true)?:array();
|
||||
$crashed=$row['event']==='crash_summary' ? '<br>故障:'.esc_html(($fields['source_version']??'未知').' ('.($fields['source_build']??'未采集').')') : '';
|
||||
echo '<tr><td>'.esc_html($row['occurred_at']).'<br>送达 '.esc_html($row['received_at']).'</td><td>'.esc_html($row['client_version'].' ('.$row['client_build'].')').$crashed.'</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>';
|
||||
echo '</p><p>仅包含产品版本、环境、阶段耗时、资源使用、错误代码及本产品崩溃/卡顿调用栈摘要,不接收素材、预设、硬件UUID或账户凭据。</p></div>';
|
||||
}
|
||||
}
|
||||
Dayu_Color_Beta::boot();
|
||||
@@ -0,0 +1,14 @@
|
||||
大鱼调色 1.18.0(105)增强公测故障诊断,主 APP 注册成功及关闭窗口后继续在后台运行,菜单栏可重新打开、发送摘要或退出。
|
||||
|
||||
- 崩溃摘要记录故障发生时的实际版本、异常终止类别、镜像 UUID 和地址偏移,排除开发自检报告。
|
||||
- 卡顿时限频采集本产品调用栈摘要,按分钟汇总渲染、状态构建、检视器刷新和跟踪耗时,以及内存、CPU 和线程数。正常菜单与模态事件循环继续响应探针。
|
||||
- 沿用可关闭的公测诊断开关及 30 天保留,不上传素材、LUT、预设、账号或原始系统诊断文件。
|
||||
- 安装器增加常驻主 APP 的正常退出检查,更新后启动正式版本。
|
||||
|
||||
云端历史报告中,外部 1.10.0 的通知回调崩溃对应 1.11.0 起已有的修复;历史卡顿与 dyld 报告信息不足,本版本用于补足现场证据,不宣称已解决全部用户闪退或卡顿。
|
||||
|
||||
实际编译提交:`d0187695581fa3a8fe5c3cfa8a1bc6337425f5f6`。APP 与 PKG 均使用 Developer ID 签名、Apple 公证及票据验证;系统要求 macOS 14.6+,Apple Silicon。安装前保存工作,按系统提示正常退出宿主和主 APP。
|
||||
|
||||
安装包与符号附件的 SHA-256、签名、公证和实际宿主验收范围见本标签下 verification/Package.json、verification/Symbols1.18.0.json 与 verification/Diagnostics1.18.0.json。
|
||||
|
||||
安装包:大鱼调色-1.18.0.pkg(46620783 字节),SHA-256:`4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f`。
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"title": "大鱼调色 1.18.0 公测版|后台自动诊断与多目标马赛克",
|
||||
"content": "<!-- wp:paragraph -->\n<p>大鱼调色是适用于 Final Cut Pro 和 Motion 的原生 FxPlug 4 调色插件。1.18.0(构建 105)公测版加入后台自动诊断,便于继续排查闪退与界面卡顿;同时保留调色、图章、蒙版跟踪和马赛克功能。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>本文主下载已更新为 1.18.0(构建 105)。该版本用于补充排查信息,目前尚未确认所有卡顿的根因,也不代表追踪速度已经改善。此前的安装完整性修复继续保留。</strong></p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>官方原始安装包不加密,不限制安装数量。</strong> 安装和使用无需登录、激活码或机器码。原始 PKG 可以原样转发,请保持安装包完整。禁止二次加密或加上一机一码后分发。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.18.0 自动诊断与后台运行</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>主 App 关闭窗口后继续在后台运行。</strong> 注册完成后不再倒计时退出,可从菜单栏重新打开窗口、发送诊断摘要或主动退出。保持主 App 运行有助于持续发现本插件的崩溃报告。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>开启公测诊断后,自动收集并发送限量摘要。</strong> 内容包括本插件主 App/服务的崩溃信息、卡顿调用栈,以及界面刷新、跟踪和渲染耗时统计。离线时排队,恢复连接后重试;诊断可在主 App 中关闭,云端保留 30 天。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>诊断不上传素材、LUT、个人预设、账号或原始系统报告;不会自动上传 Final Cut Pro 本身的完整崩溃报告。如果宿主再次闪退,请记下发生时间,并提供主 App 显示的报告标识,便于对应排查。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>近期版本还加入独立调色效果、水平校正和多目标马赛克。</strong> 检视器恢复折叠与内部滚动;“全部人脸”可逐帧识别,也可将暂停画面中的人脸转为可选蒙版,再对指定目标执行跟踪。实际多人运动、遮挡和界面流畅度仍需继续验证。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.14.3 界面展示</h2>\n<!-- /wp:heading -->\n\n<!-- wp:image {\"id\":15861,\"sizeSlug\":\"full\",\"linkDestination\":\"none\"} -->\n<figure class=\"wp-block-image size-full\"><img src=\"https://dayu.media/wp-content/uploads/2026/11/1793904608-fab8ae3ea572b84.png\" alt=\"大鱼调色 1.14.3 实际界面,画布仿制图章、检视器、蜘蛛盘校色仪及示波器\" class=\"wp-image-15861\" width=\"2046\" height=\"1570\" /><figcaption class=\"wp-element-caption\">大鱼调色 1.14.3 实际界面</figcaption></figure>\n<!-- /wp:image -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.14.3 跟踪更新</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>仿制图章跟踪更稳。</strong> 取样区和覆盖区分别跟随画面移动与缩放。新版会平滑两边的轨迹,并在像素之间连续取样,减少画面跳动和边缘闪烁。已有图章可选中后重新执行一次“双向跟踪”。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>图章和蒙版都能查看跟踪进度。</strong> 开始跟踪后,控制面板右侧显示方向、已完成帧数和百分比。画面与轮廓同步更新,图章用青色标出取样区、黄色标出覆盖区。自动跟踪时播放头留在起始位置,跟踪结束后可以查看最后一帧。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>在画布右下角选择仿制图章,先点选取样中心,再拖出覆盖区。选中图章后可拖动青色十字更换取样位置。要跟踪已有图章或蒙版,可在控制面板左侧选中它,再选择正向、反向或双向跟踪。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>本机在 Final Cut Pro 12.4 的 4K 实拍副本上验证,仿制图章和矩形蒙版各完成了 190 帧双向跟踪。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">在时间线里完成调色</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>色彩管理与基础调整</strong>:支持 CST 输入、工作空间和输出转换,并提供曝光、白平衡、曲线、HSL、色轮及蜘蛛盘等调节工具。首次使用时,请在一级调色中选择与素材相符的输入曲线和色域。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>LUT 与风格管理</strong>:通过缩略图浏览、收藏和预览管理常用 LUT,支持自选 LUT 文件与文件夹。完整预设用于保存组合调节;适合静态颜色变换的处理可导出 Cube LUT,颗粒、晕光、蒙版等时间或空间效Line truncated
|
||||
"excerpt": "大鱼调色 1.18.0(105)加入后台自动诊断,主 App 关闭窗口后继续运行。开启诊断后自动发送本插件的崩溃、卡顿和耗时摘要;保留独立调色效果与多目标马赛克。官方安装包无需激活。",
|
||||
"seo": {
|
||||
"title": {
|
||||
"enabled": true,
|
||||
"value": "大鱼调色 1.18.0 公测版|后台自动诊断与多目标马赛克"
|
||||
},
|
||||
"description": {
|
||||
"enabled": true,
|
||||
"value": "大鱼调色 1.18.0 是适用于 Final Cut Pro 和 Motion 的原生调色插件。主 App 可后台运行,开启诊断后自动发送本插件的崩溃、卡顿和性能摘要,便于继续排查问题。包含 16 个独立调色效果与多目标马赛克。官方 PKG 已签名公证,无需激活。"
|
||||
},
|
||||
"keywords": {
|
||||
"enabled": true,
|
||||
"value": "大鱼调色,Final Cut Pro,Motion,FxPlug4,调色插件,仿制图章,蒙版跟踪,逐帧预览"
|
||||
}
|
||||
},
|
||||
"resource": {
|
||||
"cao_original_filename": "大鱼调色-1.18.0.pkg"
|
||||
}
|
||||
}
|
||||
+39
-3
@@ -11,6 +11,7 @@ import shutil
|
||||
import stat
|
||||
import subprocess
|
||||
import tempfile
|
||||
import xml.etree.ElementTree as ET
|
||||
import sys
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
@@ -57,6 +58,37 @@ def check_package_bundle_access(package):
|
||||
return len(entries)
|
||||
|
||||
|
||||
def prepare_resident_entry(skill, destination):
|
||||
"""Reuse Forge core; add our resident wrapper to its normal-quit checks."""
|
||||
runner = skill / "package_fxplug.py"
|
||||
entry = skill / "PackageFxPlug.swift"
|
||||
source = entry.read_text()
|
||||
anchor = " var hosts = ApplicationToClose.presets\n"
|
||||
assert source.count(anchor) == 1, "PKG 工坊入口变化,须重新核对常驻 APP 退出规则"
|
||||
replacement = anchor + """ for item in items where item.kind == .fxPlug {
|
||||
hosts.append(try ApplicationToClose.read(URL(fileURLWithPath: item.sourcePath)))
|
||||
}
|
||||
"""
|
||||
destination.mkdir()
|
||||
shutil.copy2(runner, destination / runner.name)
|
||||
(destination / entry.name).write_text(source.replace(anchor, replacement))
|
||||
return dict(upstreamEntrySHA256=hashlib.sha256(entry.read_bytes()).hexdigest(),
|
||||
adaptedEntrySHA256=hashlib.sha256((destination / entry.name).read_bytes()).hexdigest(),
|
||||
requiredApplication="com.dayu.color")
|
||||
|
||||
|
||||
def check_resident_close(package):
|
||||
with tempfile.TemporaryDirectory(dir=CACHE) as scratch:
|
||||
expanded = Path(scratch) / "expanded"
|
||||
run("pkgutil", "--expand", str(package), str(expanded))
|
||||
distribution = ET.parse(expanded / "Distribution")
|
||||
identifiers = [x.attrib.get("id") for x in distribution.findall(".//must-close/app")]
|
||||
assert "com.dayu.color" in identifiers, "安装器必须正常退出常驻主 APP"
|
||||
preinstalls = list(expanded.glob("*.pkg/Scripts/preinstall"))
|
||||
assert preinstalls and all("'com.dayu.color'" in p.read_text() for p in preinstalls)
|
||||
return dict(identifiers=identifiers, preinstallGuardCount=len(preinstalls), normalQuit=True)
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--pkg-forge-repo", type=Path,
|
||||
@@ -112,11 +144,13 @@ 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、预设或媒体文件。\n\n公测诊断默认开启,可在主 APP 关闭。仅发送版本、系统环境、加载耗时与本插件错误摘要到 dayu.media;不发送素材、预设或账号,保留30天。主 APP 启动时检查更新,新版由用户确认安装。",
|
||||
license="", conclusion="大鱼调色已安装。主 APP 自动注册插件,成功后显示3秒倒计时退出。可点击“打开 FCP 检查”保留窗口,并在宿主中实际检查效果。"))
|
||||
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 自动注册插件,成功后保持运行。关闭窗口仍在后台收集已开启的诊断;菜单栏可重新打开或退出。请重开宿主并实际检查效果。"))
|
||||
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)]
|
||||
adapter = stage / "forge-entry"
|
||||
adapter_record = prepare_resident_entry(skill, adapter)
|
||||
command = ["/usr/bin/python3", str(adapter / "package_fxplug.py"), "--repo", str(forge), "--manifest", str(manifest_path)]
|
||||
subprocess.run(command + ["--check"], check=True)
|
||||
if args.prepare_only:
|
||||
print("清单:" + str(manifest_path))
|
||||
@@ -127,6 +161,7 @@ def main():
|
||||
subprocess.run(command, stdout=log, stderr=subprocess.STDOUT, check=True)
|
||||
package = args.output_dir / ("大鱼调色-" + version + ".pkg")
|
||||
verified_payload_entries = check_package_bundle_access(package)
|
||||
resident_close = check_resident_close(package)
|
||||
report_path = ROOT / "verification/Package.json"
|
||||
subprocess.run(["/usr/bin/python3", str(skill / "verify_fxplug_package.py"), "--manifest", str(manifest_path),
|
||||
"--package", str(package), "--report", str(report_path)], check=True)
|
||||
@@ -138,6 +173,7 @@ def main():
|
||||
report = json.loads(report_path.read_text())
|
||||
report.update(notarization=job, appCompiledSource=delivery["sourceCommit"], appBuild=info["CFBundleVersion"],
|
||||
packageBuilderRemote="https://dayu.media/git/dayu/pkg-forge.git",
|
||||
residentAppClosing=resident_close, packageEntryAdaptation=adapter_record,
|
||||
packageBuilderCommit=run("git", "rev-parse", "HEAD", cwd=forge), templateSHA256=hashes,
|
||||
payloadBundleAccess=dict(entries=verified_payload_entries, scope="Read/traverse modes for installer-owned app entries, from the package BOM"),
|
||||
installedAppHostAcceptance=delivery.get("hostVerification", "verification/HostLUTLoading.json"),
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
优化蒙版与马赛克跟踪的数据传输和计算复用,并减少参数面板的重复刷新。
|
||||
|
||||
- Metal 输出紧凑灰度数据,4K 回读量减少 75%;特征检测限定在目标范围,OpenCV 光流复用金字塔。
|
||||
- 同一 4K 实拍 285 帧的纯追踪计算由 8.78 秒降至 1.31 秒,轨迹与旧版逐帧一致。此数字不包括宿主供图、解码、预览和渲染。
|
||||
- 参数读取按单次操作复用;只在显示内容变化时重建图层列表。
|
||||
- 保留 1.18.0 的后台自动诊断和关窗常驻行为,可在主 App 关闭诊断。
|
||||
|
||||
已完成签名、公证、票据、964 项正式安装原生检查与 FCP 两轮 285 帧追踪验收。人脸转身/遮挡后的偏移仍需检查;本版不宣称提升追踪精度。旧 Metal 光流实验因整段测试丢轨而未启用。
|
||||
|
||||
版本 1.18.1,构建 106;实际编译源码 `1cc7f8edb2acb3cfc62bd72447c2956ad7a01601`。安装前请保存并正常退出 Final Cut Pro、Motion 和大鱼调色主 App。
|
||||
@@ -94,7 +94,7 @@ PQ/HLG 输出或跟随 Rec.2020 宿主暂只接受一级与印片;存在活跃
|
||||
|
||||
1.7.1 兼容颜色数据行夹带文字的 Cube:保留数值前缀、未读取通道补 0、保持原行位置。用户原文件 65³ 全表与本机 FCP 自定 LUT 读取规则对照通过;正式路径407项原生检查、FCP导入/缩略图/应用/冷重开通过,原始字节保留。见[兼容依据](research/LUTNotes1.7.1.md)、[宿主验证](verification/HostLUTNotes1.7.1.json)和[1.7.1安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.7.1-lut-notes-20261102)。网站公测更新清单仍为原1.7.0,本轮未改动后端。
|
||||
|
||||
主 APP 保留深色介绍、置顶发布地址、自动注册和3秒退出倒计时;加入启动自动检查公测更新和可关闭的云端诊断。更新使用完整 PKG,由用户确认下载并通过完整性、签名与产品校验后打开系统安装器;安装前要求保存并退出 FCP/Motion。诊断记录版本、环境、启动/界面/管线/首次渲染耗时及错误摘要,后台限量重试、云端去重并保留30天,不发送素材、LUT、预设、账号或硬件 UUID。暂未加入登录、授权及业务加密模块。
|
||||
主 APP 保留深色介绍、置顶发布地址和自动注册;1.18.0 起保持后台运行,关闭窗口不退出,菜单栏可重新打开或退出;加入启动自动检查公测更新和可关闭的云端诊断。更新使用完整 PKG,由用户确认下载并通过完整性、签名与产品校验后打开系统安装器;安装前要求保存并退出 FCP/Motion。诊断记录版本、环境、启动/界面/管线/首次渲染耗时及错误摘要,后台限量重试、云端去重并保留30天,不发送素材、LUT、预设、账号或硬件 UUID。暂未加入登录、授权及业务加密模块。
|
||||
|
||||
[1.7.0站点公测安装包](https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg)、[1.7.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.7.0-beta-20261102)、[日志管理页](https://dayu.media/wp-admin/tools.php?page=dayu-color-beta)(管理员)。反馈可附主 APP 的报告标识与发生时间。详见[公测前后端与隐私/恢复说明](Backend/README.md)、[1.7.0发行说明](Packaging/Release-1.7.0.md)和[正式宿主/日志验证](verification/BetaClientQA.json)。本轮保留既有调色与宿主回调逻辑,收集偶发卡死证据,尚未宣称解决该问题。
|
||||
|
||||
|
||||
+18
-2
@@ -1,12 +1,28 @@
|
||||
# 2026-11-06 后台诊断 1.18.0(105)
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。实际编译提交 **`d0187695581fa3a8fe5c3cfa8a1bc6337425f5f6`**;发行标签 **`v1.18.0-diagnostics-20261106`** 指向 **`a03a056bff17daadce77128f767a08e98dc830dd`**。独立远端检出核对编译节点 724 个和发行标签 728 个文件,Git 完整性通过,无 LFS 指针或子模块;原工作区仅有前序 project.pbxproj Security 引用排序未提交。[恢复核验](verification/Recovery1.18.0.json)
|
||||
|
||||
新机器先恢复 Git 登录,再克隆并 `git switch --detach <所需完整提交>`。使用 Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+、Release,依赖源包/锁及 `tools/build_tracking_opencv.py` 沿用。`tools/deliver.py` 完成签名、公证、正式路径安装和原生检查;真实宿主验收后输入 complete。主 ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队 B3W25FX5H5,唯一正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。证书私钥、公证 profile 和 Git 凭据需独立恢复,仓库不含秘密。
|
||||
|
||||
APP 公证 `5a98cab1-23af-4034-abc9-0c9e7b1dc77d`、PKG 公证 `8c4fa3f6-4866-429a-8750-8567f7db4766` 均 Accepted。使用 `Packaging/build_pkg.py` 复用 PKG 工坊真实核心,项目入口增加常驻主 APP 正常退出规则。20 项验包、198 条载荷权限检查、961 项原生检查、75 项诊断检查以及真实云端采样送达验证通过;本轮没有重复运行 PKG 系统安装脚本。
|
||||
|
||||
Release **401** 的安装包附件 **45** 与符号附件 **46**,均先验证草稿下载再发布并再次完整下载校验。安装包 **46,620,783 字节**,SHA-256 **`4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f`**;符号 ZIP **3,562,272 字节**,SHA-256 **`a5bf3a6cc836c5da0471d9a70d2eb9e81a5166c63bbfae993a910ba859936c9c`**。恢复符号后先核对 UUID,再用 atos 或符号化工具处理云端 imageOffset;不以另一构建的同名 dSYM 代替。[Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.18.0-diagnostics-20261106) · [符号 UUID](verification/Symbols1.18.0.json) · [发布核验](verification/Release1.18.0.json)
|
||||
|
||||
后端源在 NAS SMB:`/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media`,本地专项 `/Users/mac/Downloads/dayumedia/dayu-color-beta`。后端 MU 文件和 beta 清单的旁路备份与实际路径见 [后端部署](verification/BetaBackendDeployment.json)、[更新通道](verification/BetaPublication1.18.0.json)。站点文章本轮未改。当前源码和发行附件可从远端恢复;证书私钥以及服务器自身的异地备份不在此保证范围。
|
||||
|
||||
[调查与未解决项](research/CloudDiagnostics1.18.0.md) · [实际验收范围](verification/Diagnostics1.18.0.json) · [开发交接](开发交接.md)。以下为历史记录。
|
||||
|
||||
---
|
||||
|
||||
# 2026-11-06 折叠检视器与指定人脸 1.17.1(103)
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。实际编译源码 **`3b4c612edf99c0ef2b972b7305cd7ba44244a7c6`**。独立远端检出核对全部 714 个跟踪文件与 Git blob,`git fsck --full --strict` 通过,无 LFS 指针/子模块。发行标签将在安装包验证后记录。[恢复核验](verification/Recovery1.17.1.json)
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。实际编译源码 **`3b4c612edf99c0ef2b972b7305cd7ba44244a7c6`**。独立远端检出核对全部 714 个跟踪文件与 Git blob,`git fsck --full --strict` 通过,无 LFS 指针/子模块。发行标签 **`v1.17.1-inspector-mosaic-20261106`** 指向 **`7c0bfa5352f282bcec0aedf43be29af4432f2ba8`**,独立检出核对 718 个文件;差异仅为交付记录与模板模型来源哈希,编译输入一致。[恢复核验](verification/Recovery1.17.1.json)
|
||||
|
||||
构建环境:Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+、Release;ThirdParty 的依赖源包/锁和 `tools/build_tracking_opencv.py` 沿用。克隆后 `git switch --detach <完整提交>`,使用 `tools/deliver.py` 完成正式构建、签名、公证、安装与原生检查;保持交互输入,在宿主验证后输入 complete。主 ID `com.dayu.color`、服务 `com.dayu.color.XPC`,团队 B3W25FX5H5。证书私钥、公证 profile 与 Git 登录须独立恢复,源码仓库不含秘密。
|
||||
|
||||
APP 公证 **`36ecb7e6-5cfc-4b85-8363-11272d880b18`** Accepted,票据和 Gatekeeper 通过。唯一正式路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app` 为 1.17.1(103),961 项正式原生检查通过;FCP 12.4 已确认默认三组、折叠标题、展开后内部滚动、收起后移除滚动以及当前帧转人脸蒙版入口。外层行高仍受 FCP 缓存限制,内部视窗收缩不代表宿主外框缩短。实鼠松手保存、真实多人运动/遮挡/交叉与播放性能由用户后续复测。[宿主检查](verification/HostInspectorMosaic1.17.1.json) · [专项回归](verification/InspectorMosaic1.17.1.json)
|
||||
|
||||
使用 `Packaging/build_pkg.py` 从已签名公证且正式安装验收的 APP 打包,随后 `Packaging/publish_release.py` 发布已验证标签的安装包。正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.17.1.pkg`,46,600,407 字节,SHA-256 `5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710`;PKG 公证 `8e122236-9ca6-4d92-ad6a-b9c2411280e7` Accepted,票据、Gatekeeper、20 项展开与 198 条载荷权限检查通过。本机没有重复运行系统 PKG 安装脚本。Release 上传准备中。[开发交接](开发交接.md)
|
||||
使用 `Packaging/build_pkg.py` 从已签名公证且正式安装验收的 APP 打包,随后 `Packaging/publish_release.py` 发布已验证标签的安装包。正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.17.1.pkg`,46,600,407 字节,SHA-256 `5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710`;PKG 公证 `8e122236-9ca6-4d92-ad6a-b9c2411280e7` Accepted,票据、Gatekeeper、20 项展开与 198 条载荷权限检查通过。本机没有重复运行系统 PKG 安装脚本。Release **400**/附件 **44** 已按公测标记发布,草稿与正式下载均完整核对大小与 SHA-256。[发行页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.17.1-inspector-mosaic-20261106) · [发布核验](verification/Release.json)。本轮恢复 clone、下载副本、构建 APP、公证 ZIP、旧替换备份和包暂存已核验后清理。[清理记录](verification/Cleanup1.17.1.json) · [开发交接](开发交接.md)
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
# 云端闪退与卡顿调查 · 2026-11-06
|
||||
|
||||
基线:main `ae0a64ec843fd450329083cb703890d8b2684007`,正式安装 1.17.1(103)。生产 MU 插件、专项副本及仓库副本 SHA-256 均为 `d2b73816e871765bc2f7d1604a1beda98b99e2d9ac4f62039de7bf3a81107593`。现有 project.pbxproj 三处 Security 引用排序为前序未提交内容,不纳入本任务。
|
||||
|
||||
## 云端证据
|
||||
|
||||
通过已登录的管理员页面 `https://dayu.media/wp-admin/tools.php?page=dayu-color-beta` 只读筛选,2026-11-06 16:34–16:37(北京时间)看到近七天 85 个匿名报告标识。它们不是实名用户数;包含本机开发与验收。原始报告和安装标识不复制到源码。
|
||||
|
||||
- `crash_summary` 共 43 条(筛选结果不足一页,无下一页):39 条 source_version=1.10.0,1 条 1.13.3,2 条 1.7.4,1 条 1.8.0。上传客户端常为 1.14.3/1.14.4,不能据此称为新版崩溃。
|
||||
- 1.10.0 的外部记录集中在 `DYRenderer renderLegacy:...` 的异步 block 和 `NSNotificationCenter postNotificationName:object:userInfo:`,异常 EXC_BAD_ACCESS/SIGSEGV。既有提交 `1c3e294ce991b0205969486c330dba57714aeacc` 已将 C++ lambda 内异步通知移入 Objective-C 方法,修复对象生命周期;1.11.0 起包含该修复。样本支持同一历史故障特征,不证明最新版本仍有该故障或所有反馈均解决。
|
||||
- 7 条可关联本机开发标识,含 `DYRunDiagnostics`、ASAN 及早期原生回归;需与外部故障分开。外部共有 36 条:34 条来自 1.10.0,2 条来自 1.7.4。
|
||||
- 1.7.4 两条为 dyld 启动终止,旧采集未保存 termination 原因和镜像偏移,无法判定缺库、兼容性还是安装问题。
|
||||
- `main_thread_stall` 最近 50 条包含外部 1.14.4 的约 6–30 秒和 1.12.0 的约 6–36 秒无响应;全部 active_stages 为空。本机 1.17.1 的连续 6–357 秒记录也混在其中,可能包括菜单/模态循环导致的主队列探针延迟,不能当作真实死锁结论。本次未做全量卡顿数量统计。
|
||||
- `operation_stall` 筛选为空。`render_error` 存在同一外部标识反复上报 NSCocoaErrorDomain/260(文件不存在),涉及 1.10.0 和 1.14.4;未带资源类别,无法从摘要判断是 LUT、内置资源还是其他文件。保留用户路径隐私,后续只增加阶段和文件扩展名等限定信息。
|
||||
|
||||
## 本轮实施范围
|
||||
|
||||
取消主 APP 注册后倒计时退出,关闭窗口后保留后台运行,提供重新打开与明确退出入口。补充持续扫描自身 APP/插件系统报告、崩溃实际版本与 build、异常终止类别、镜像 UUID/偏移;卡顿使用公共运行循环探针、限频调用栈摘要与资源统计;渲染与跟踪持续阶段、慢操作摘要,避免每帧磁盘和网络发送。现有诊断开关及 30 天保留不变,不上传素材、LUT、预设、账号和原始诊断文件。
|
||||
|
||||
正式路径采集验收见下方;发行状态见开发交接及版本记录。卡顿具体根因和 dyld 历史报告仍待新版本现场数据。
|
||||
|
||||
数据结构依据:[Apple IPS JSON 说明](https://developer.apple.com/documentation/xcode/interpreting-the-json-format-of-a-crash-report);运行循环依据:[CFRunLoop](https://developer.apple.com/documentation/corefoundation/cfrunloop)。
|
||||
|
||||
## 正式路径候选 104 的验收修正
|
||||
|
||||
FCP 12.4 加载、播放和阶段汇总上报通过。受控主线程暂停 12 秒时,采样以 timeout_or_disabled 送达,因此候选未发布。移除 sample 的 -mayDie(避免采样前预读符号),后台符号处理上限改为 30 秒;采集本身仍为 1 秒/10 ms 间隔,保留限频、关闭诊断取消及临时文件清理。后续以 105 正式路径再次验证实际调用栈。
|
||||
|
||||
## 105 实际运行结果
|
||||
|
||||
75 项离线诊断检查、27 项后端合同检查与正式安装的 961 项原生回归通过。受控 12 秒主 APP 卡顿在 17:17:01(本地)生成 captured 调用栈,17:17:02 云端送达,明确包含 AppDelegate runDiagnosticsProbe → NSThread sleepForTimeInterval → nanosleep,标记 verification。关闭诊断超过一分钟且宿主启动/播放时没有新增上报,待发送队列清零;重新开启后两进程恢复上报。关窗后同一普通 APP 进程跨两轮分钟统计持续送达。
|
||||
|
||||
FCP 12.4 显示 1.18.0,当前 11.4 秒片段可播放到末尾,无新增宿主崩溃记录。但 3840×2160 输入在该轮 28 次渲染的平均调用耗时 601.4 ms、最大 1716.8 ms;41 次 plugin_state 平均 4.31 ms、最大 8.68 ms。证据将该样本主要耗时指向渲染而非状态构建;尚不能从聚合值确定渲染内部算法,也不能直接当作播放 FPS。保留这一待优化项,不宣称卡顿已解决。
|
||||
|
||||
用户刚才疑似闪退已与本轮正常退出操作及系统退出码 0 对齐,并经用户确认。10:30 的历史 FCP ProOSC 中止另行记录;没有证据将其归因于本轮诊断。详见 verification/LocalHostExit1.18.0.json。
|
||||
@@ -16,3 +16,9 @@
|
||||
- `DYViewerParameterBridge.inc.h` 支持当前帧多人脸一次转成独立共享蒙版,多选使用稳定 ID。每个人脸先生成静态框,用户在控制面板逐个运行现有 OpenCV 跟踪。无身份识别或全片自动人脸身份归并;重叠、遮挡和交叉仍需实拍检查。
|
||||
- 961 项原生 Release 预检通过。新增双时钟手绘保存/回读、默认无滚动、展开/追加滚动、多人脸导入一次撤销、单人选择区域外像素完全一致和完整文档回读检查。两个人脸来自公共 NASA 人像的并排合成,不能替代两名不同人物的运动视频测试。
|
||||
- 16 个独立效果及整合模板静态检查通过;仅刷新模型来源哈希,模板文件与上一版一致。独立远端恢复编译提交 714 个文件逐一校验,无 LFS 指针/子模块。
|
||||
|
||||
## 正式交付
|
||||
|
||||
1.17.1(103)APP 公证 `36ecb7e6-5cfc-4b85-8363-11272d880b18` Accepted,正式路径 961 项检查通过;FCP 12.4 冷加载、默认三组、展开内部滚动、折叠复位及本帧人脸转换菜单已验证。实鼠手绘和运动多人由用户继续测试。
|
||||
|
||||
PKG 公证 `8e122236-9ca6-4d92-ad6a-b9c2411280e7` Accepted,20 项展开检查与 198 条载荷权限检查通过。发行标签 `v1.17.1-inspector-mosaic-20261106` 指向 `7c0bfa5352f282bcec0aedf43be29af4432f2ba8`,Release 400/附件 44 的草稿及正式完整下载验证一致,保留产品公测标记。编译节点 714 文件与发行标签 718 文件独立远端恢复通过。详细证据见 `verification/HostInspectorMosaic1.17.1.json`、`Recovery1.17.1.json`、`Release.json`、`Cleanup1.17.1.json`。
|
||||
@@ -0,0 +1,17 @@
|
||||
# 1.18.1 跟踪与界面优化
|
||||
|
||||
2026-11-06。实际编译源码 `1cc7f8edb2acb3cfc62bd72447c2956ad7a01601`。正式安装 1.18.1(106)已通过 Apple 公证、票据及安装后 964 项原生检查。文章此前已更新 1.18.0。
|
||||
|
||||
- 基线实际使用 Metal 预处理、CPU OpenCV 特征检测与双向 LK、CPU RANSAC。旧 Metal 光流存在但未接入当前跟踪器。
|
||||
- 最终版本保留完整 4K 分析分辨率、OpenCV 特征阈值、亚像素细化、仿射估计与可信轨迹保护。特征检测限定至目标凸包加 12px 边缘。双向 LK 保留 CPU OpenCV,复用金字塔和梯度。
|
||||
- Metal 光流候选通过六组合生成图及 12 项算法回归,但整段实拍失败,未用于正式路径。候选证据只保留作研究记录。
|
||||
- UI:DYToolManager 每次单个参数读取都重建完整层状态;Inspector 每组重复读取宿主参数;工作区每次标量变化都重建列表。候选改为单次 Action 快照、复用本次读回、仅在列表模型变化时重建。加入同 Action 写后读与外部编辑失效检查。
|
||||
- 资料:[Apple GPU 同步](https://developer.apple.com/documentation/metal/resource-synchronization)、[Apple MPS 调优](https://developer.apple.com/documentation/metalperformanceshaders/tuning-hints)、[OpenCV LK](https://docs.opencv.org/3.4.4/dc/d6b/group__video__track.html)。Metal LK 是本产品原有实现,不能声称与 OpenCV 逐帧严格等价。
|
||||
|
||||
## 整段验证后的决策
|
||||
|
||||
旧 Metal LK 在 4K 实拍转身到第 133 帧时丢轨,CPU 完成 285 帧。该实验不接入正式路径,仅保留可重现基准和拒收证据。最终候选使用 Metal 直接生成 Gray8,读回量从每个 4K 帧约 33.2MB 降为 8.3MB;目标区域特征检测和 OpenCV 双向金字塔复用共同减少 CPU 工作。
|
||||
|
||||
同一整段、相同起点,原 CPU 算法处理 8776.57ms,最终版本 1306.09ms,285 帧中心/缩放/旋转差异均为 0。该数字不含供图、解码、磁盘、宿主 UI 与渲染,不等于整体追踪快 6.7 倍。正式 FCP 独立验收副本中完成两轮 285 帧追踪、模块切换、曝光修改还原及蒙版编辑;未测端到端耗时或 UI 延迟分位数。
|
||||
|
||||
转身后人脸目标仍会漂移;原版与优化版在相同离线输入上轨迹完全一致。这版优化速度,不宣称解决目标遮挡/转身精度。完成 285 帧不等于目标位置全部准确。
|
||||
@@ -82,7 +82,7 @@ def main():
|
||||
if dest.is_symlink():dest.unlink()
|
||||
if not dest.exists():dest.symlink_to(src)
|
||||
bridge=ROOT/'tools/tracking/DYOpenCVTracker.cpp';obj=libs/'DYOpenCVTracker.o';runtime=libs/'libDayuOpenCVTracker.a'
|
||||
identity=hashlib.sha256(bridge.read_bytes()+(ROOT/'大鱼调色/Plugin/MaskCore/DYOpenCVTracker.hpp').read_bytes()+marker.read_bytes()).hexdigest()
|
||||
identity=hashlib.sha256(bridge.read_bytes()+(ROOT/'大鱼调色/Plugin/MaskCore/DYOpenCVTracker.hpp').read_bytes()+(ROOT/'大鱼调色/Plugin/MaskCore/DYTracker.hpp').read_bytes()+marker.read_bytes()).hexdigest()
|
||||
bridgeMarker=CACHE/'bridge-build.json'
|
||||
if not runtime.exists() or not bridgeMarker.exists() or json.loads(bridgeMarker.read_text()).get('identity')!=identity:
|
||||
run(['xcrun','clang++','-std=c++17','-arch','arm64','-mmacosx-version-min=14.6','-O3','-fvisibility=hidden',
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
namespace dy {
|
||||
struct OpenCVTracker::Impl {
|
||||
cv::Mat previous;
|
||||
std::vector<cv::Mat> previousPyramid;
|
||||
std::shared_ptr<FlowBackend> flow;
|
||||
std::vector<cv::Point2f> points, polygon;
|
||||
std::vector<FlowPoint> mask;
|
||||
TrackerROI seed{};
|
||||
@@ -18,6 +20,7 @@ struct OpenCVTracker::Impl {
|
||||
|
||||
static cv::Mat gray8(const GrayFrame& f) {
|
||||
if(!f.valid())return {};
|
||||
if(f.pixels.empty())return cv::Mat(f.height,f.width,CV_8UC1,const_cast<uint8_t*>(f.bytes.data())).clone();
|
||||
cv::Mat out(f.height,f.width,CV_8UC1);
|
||||
for(size_t i=0;i<f.pixels.size();++i) {
|
||||
float x=f.pixels[i];
|
||||
@@ -34,7 +37,15 @@ struct OpenCVTracker::Impl {
|
||||
cv::convexHull(vertices,hull,false,true);
|
||||
cv::Mat area=cv::Mat::zeros(height,width,CV_8UC1);
|
||||
cv::fillPoly(area,std::vector<std::vector<cv::Point>>{hull},cv::Scalar(255),cv::LINE_AA);
|
||||
cv::goodFeaturesToTrack(previous,points,300,.03,10.,area,3,false,.04);
|
||||
// Corner detection previously evaluated the whole 4K frame even for a
|
||||
// small face. Keep a halo for the gradient/local-maximum stencil, then
|
||||
// restore full-frame coordinates before subpixel refinement and flow.
|
||||
cv::Rect bounds=cv::boundingRect(hull);
|
||||
bounds.x-=12;bounds.y-=12;bounds.width+=24;bounds.height+=24;
|
||||
bounds&=cv::Rect(0,0,width,height);
|
||||
if(bounds.empty())return;
|
||||
cv::goodFeaturesToTrack(previous(bounds),points,300,.03,10.,area(bounds),3,false,.04);
|
||||
for(auto& p:points)p+=cv::Point2f(float(bounds.x),float(bounds.y));
|
||||
if(!points.empty())cv::cornerSubPix(previous,points,{10,10},{-1,-1},
|
||||
{cv::TermCriteria::COUNT|cv::TermCriteria::EPS,20,.03});
|
||||
}
|
||||
@@ -46,10 +57,11 @@ struct OpenCVTracker::Impl {
|
||||
OpenCVTracker::OpenCVTracker():impl_(std::make_shared<Impl>()){}
|
||||
OpenCVTracker::~OpenCVTracker()=default;
|
||||
void OpenCVTracker::setMask(std::vector<FlowPoint> p){impl_->mask=std::move(p);}
|
||||
void OpenCVTracker::setFlowBackend(std::shared_ptr<FlowBackend> flow){impl_->flow=std::move(flow);stop();}
|
||||
const char* OpenCVTracker::version(){return CV_VERSION;}
|
||||
TrackResult OpenCVTracker::result()const{return impl_->value;}
|
||||
bool OpenCVTracker::active()const{return impl_->running;}
|
||||
void OpenCVTracker::stop(){impl_->running=false;impl_->value.valid=false;}
|
||||
void OpenCVTracker::stop(){impl_->running=false;impl_->value.valid=false;impl_->previous.release();impl_->previousPyramid.clear();impl_->points.clear();}
|
||||
|
||||
bool OpenCVTracker::reset(const GrayFrame& f,TrackerROI roi) {
|
||||
auto& t=*impl_;t.running=false;t.frameIndex=1;t.points.clear();t.polygon.clear();
|
||||
@@ -70,6 +82,8 @@ bool OpenCVTracker::reset(const GrayFrame& f,TrackerROI roi) {
|
||||
t.polygon.emplace_back(t.center.x+c*x-s*y,t.center.y+s*x+c*y);}
|
||||
t.detect();t.value.features=int(t.points.size());t.value.inliers=t.value.features;
|
||||
if(t.points.size()<4){t.fail(TrackFailure::InsufficientTexture);return false;}
|
||||
if(t.flow&&!t.flow->reset(f)){t.fail(TrackFailure::Backend);return false;}
|
||||
if(!t.flow)cv::buildOpticalFlowPyramid(t.previous,t.previousPyramid,{21,21},3);
|
||||
t.running=true;t.value.valid=true;t.value.confidence=1;return true;
|
||||
} catch(const cv::Exception&){t.fail(TrackFailure::Backend);return false;}
|
||||
}
|
||||
@@ -84,19 +98,31 @@ TrackResult OpenCVTracker::track(const GrayFrame& f) {
|
||||
if(t.frameIndex<2||t.frameIndex%2==0)t.detect();
|
||||
t.value.features=int(t.points.size());t.value.matches=0;t.value.inliers=0;t.value.medianError=0;
|
||||
if(t.points.size()<4)return t.fail(TrackFailure::InsufficientTexture);
|
||||
std::vector<cv::Point2f> src,dst,movingSrc,movingDst;
|
||||
std::vector<cv::Mat> nextPyramid;
|
||||
if(t.flow){
|
||||
std::vector<FlowPoint> input;input.reserve(t.points.size());
|
||||
for(auto p:t.points)input.push_back({p.x,p.y});
|
||||
std::vector<FlowMatch> matches;
|
||||
if(!t.flow->advance(f,input,matches))return t.fail(TrackFailure::Backend);
|
||||
for(auto m:matches){src.emplace_back(m.p.x,m.p.y);dst.emplace_back(m.q.x,m.q.y);}
|
||||
}else{
|
||||
std::vector<cv::Point2f> forward,backward;
|
||||
std::vector<uchar> fs,bs;std::vector<float> fe,be;
|
||||
cv::TermCriteria termination(cv::TermCriteria::COUNT|cv::TermCriteria::EPS,30,.01);
|
||||
cv::calcOpticalFlowPyrLK(t.previous,next,t.points,forward,fs,fe,{21,21},3,termination,0,1e-4);
|
||||
cv::calcOpticalFlowPyrLK(next,t.previous,forward,backward,bs,be,{21,21},3,termination,0,1e-4);
|
||||
std::vector<cv::Point2f> src,dst,movingSrc,movingDst;
|
||||
const float motionThreshold=std::max(t.width,t.height)*.01f;
|
||||
// Build each frame and its gradients once; reuse them for both flow
|
||||
// directions and as the previous frame on the next analysis callback.
|
||||
cv::buildOpticalFlowPyramid(next,nextPyramid,{21,21},3);
|
||||
cv::calcOpticalFlowPyrLK(t.previousPyramid,nextPyramid,t.points,forward,fs,fe,{21,21},3,termination,0,1e-4);
|
||||
cv::calcOpticalFlowPyrLK(nextPyramid,t.previousPyramid,forward,backward,bs,be,{21,21},3,termination,0,1e-4);
|
||||
for(size_t i=0;i<t.points.size();++i) {
|
||||
// Checking both statuses also rejects a failed backward solve.
|
||||
if(!fs[i]||!bs[i]||cv::norm(backward[i]-t.points[i])>=1.)continue;
|
||||
src.push_back(t.points[i]);dst.push_back(forward[i]);
|
||||
if(cv::norm(forward[i]-t.points[i])>=motionThreshold){movingSrc.push_back(t.points[i]);movingDst.push_back(forward[i]);}
|
||||
}
|
||||
}
|
||||
const float motionThreshold=std::max(t.width,t.height)*.01f;
|
||||
for(size_t i=0;i<src.size();++i)if(cv::norm(dst[i]-src[i])>=motionThreshold){movingSrc.push_back(src[i]);movingDst.push_back(dst[i]);}
|
||||
if(movingSrc.size()>src.size()/2){src.swap(movingSrc);dst.swap(movingDst);}
|
||||
t.value.matches=int(src.size());
|
||||
if(src.size()<4)return t.fail(TrackFailure::InsufficientMatches);
|
||||
@@ -131,7 +157,7 @@ TrackResult OpenCVTracker::track(const GrayFrame& f) {
|
||||
t.value.scaleX=float(totalX);t.value.scaleY=float(totalY);t.value.scale=std::sqrt(t.value.scaleX*t.value.scaleY);
|
||||
t.value.rotation+=float(angle);t.value.confidence=confidence;t.value.valid=true;t.value.failure=TrackFailure::None;
|
||||
t.points.clear();for(size_t i=0;i<dst.size();++i)t.points.push_back(dst[i]+(center-cv::Point2f(float(tx),float(ty))));
|
||||
t.previous=next;++t.frameIndex;return t.value;
|
||||
t.previous=next;t.previousPyramid=std::move(nextPyramid);++t.frameIndex;return t.value;
|
||||
}catch(const cv::Exception&){return t.fail(TrackFailure::Backend);}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
// Same generated frames and full resolution for CPU/GPU. No host or UI runs.
|
||||
#import <Foundation/Foundation.h>
|
||||
#define main originalCPUTrackerChecks
|
||||
#include "verify_opencv_tracker.cpp"
|
||||
#undef main
|
||||
#include "../../大鱼调色/Plugin/DYToolFlow.inc.h"
|
||||
#include <iomanip>
|
||||
|
||||
int main(int argc,const char**argv){@autoreleasepool{
|
||||
if(argc!=2)return 2;
|
||||
NSURL*library=[NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[1]]];
|
||||
int failures=0;std::cout<<std::setprecision(8)<<"{\"cases\":[";bool first=true;
|
||||
for(auto dimensions:std::vector<std::pair<int,int>>{{640,480},{1920,1080},{3840,2160}}){
|
||||
int w=dimensions.first,h=dimensions.second;
|
||||
for(float size:{.12f,.7f}){
|
||||
std::vector<dy::GrayFrame> images;
|
||||
for(int i=0;i<=12;++i)images.push_back(frame(w,h,1.25*i,.5*i,.001*i,1+.001*i,1-.0007*i));
|
||||
double elapsed[2]={},maxError[2]={},maxDifference=0;bool good[2]={true,true};
|
||||
std::vector<dy::TrackResult> reference;
|
||||
for(int gpu=0;gpu<2;++gpu){
|
||||
dy::OpenCVTracker tracker;
|
||||
if(gpu){auto flow=DYToolCreateMetalFlow(library,nullptr);if(!flow)return 3;tracker.setFlowBackend(flow);}
|
||||
good[gpu]=tracker.reset(images[0],{.5f,.5f,size,size,0});
|
||||
for(size_t i=1;i<images.size()&&good[gpu];++i){
|
||||
auto begin=std::chrono::steady_clock::now();auto r=tracker.track(images[i]);
|
||||
elapsed[gpu]+=std::chrono::duration<double,std::milli>(std::chrono::steady_clock::now()-begin).count();
|
||||
good[gpu]&=r.valid;
|
||||
maxError[gpu]=std::max(maxError[gpu],std::hypot((r.cx-.5)*w-1.25*i,(r.cy-.5)*h-.5*i));
|
||||
if(!gpu)reference.push_back(r);
|
||||
else if(i<=reference.size())maxDifference=std::max(maxDifference,std::hypot(double(r.cx-reference[i-1].cx)*w,double(r.cy-reference[i-1].cy)*h));
|
||||
}
|
||||
good[gpu]&=maxError[gpu]<1.;
|
||||
failures+=!good[gpu];
|
||||
}
|
||||
if(!first)std::cout<<",";first=false;
|
||||
std::cout<<"{\"width\":"<<w<<",\"height\":"<<h<<",\"roi\":"<<size<<",\"frames\":12,\"cpuMs\":"<<elapsed[0]<<",\"metalMs\":"<<elapsed[1]<<",\"cpuErrorPx\":"<<maxError[0]<<",\"metalErrorPx\":"<<maxError[1]<<",\"differencePx\":"<<maxDifference<<",\"pass\":"<<(good[0]&&good[1]?"true":"false")<<"}";
|
||||
}
|
||||
}
|
||||
std::cout<<"],\"pass\":"<<(failures?"false":"true")<<"}\n";return failures?1:0;
|
||||
}}
|
||||
@@ -0,0 +1,27 @@
|
||||
// Reads caller-decoded gray8, excludes file reads and conversion from timings.
|
||||
// Does not modify or persist media; CPU/GPU receive the same full-size frames.
|
||||
#import <Foundation/Foundation.h>
|
||||
#include "../../大鱼调色/Plugin/MaskCore/DYOpenCVTracker.hpp"
|
||||
#include "../../大鱼调色/Plugin/DYToolFlow.inc.h"
|
||||
#include <fstream>
|
||||
#include <chrono>
|
||||
int main(int argc,const char **argv){@autoreleasepool{
|
||||
if(argc!=9&&argc!=10)return 2;int w=atoi(argv[2]),h=atoi(argv[3]);if(w<16||h<16||w>8192||h>8192)return 2;
|
||||
bool compact=argc==10&&strcmp(argv[9],"compact")==0;
|
||||
dy::TrackerROI roi{float(atof(argv[5])),float(atof(argv[6])),float(atof(argv[7])),float(atof(argv[8])),0};
|
||||
NSMutableArray *runs=[NSMutableArray array];
|
||||
for(int gpu=0;gpu<(argc==10?1:2);++gpu){
|
||||
dy::OpenCVTracker tracker;if(gpu){auto b=DYToolCreateMetalFlow([NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[4]]],nullptr);if(!b)return 3;tracker.setFlowBackend(b);}
|
||||
std::ifstream input(argv[1],std::ios::binary);if(!input)return 2;
|
||||
std::vector<uint8_t> bytes(size_t(w)*h);dy::GrayFrame f{w,h,std::vector<float>(bytes.size())};
|
||||
NSMutableArray *frames=[NSMutableArray array];double total=0,maximum=0;
|
||||
while(input.read((char*)bytes.data(),bytes.size())){
|
||||
if(compact){f.pixels.clear();f.bytes=bytes;}else for(size_t i=0;i<bytes.size();++i)f.pixels[i]=bytes[i]/255.f;
|
||||
auto start=std::chrono::steady_clock::now();bool ok=frames.count?tracker.track(f).valid:tracker.reset(f,roi);
|
||||
double ms=std::chrono::duration<double,std::milli>(std::chrono::steady_clock::now()-start).count();total+=ms;maximum=std::max(maximum,ms);auto r=tracker.result();
|
||||
[frames addObject:@{@"valid":@(ok),@"cx":@(r.cx),@"cy":@(r.cy),@"scaleX":@(r.scaleX),@"scaleY":@(r.scaleY),@"rotation":@(r.rotation),@"confidence":@(r.confidence),@"failure":@((int)r.failure)}];if(!ok)break;
|
||||
}
|
||||
[runs addObject:@{@"backend":gpu?@"Metal":@"CPU",@"frames":frames,@"milliseconds":@(total),@"maximumMs":@(maximum)}];
|
||||
}
|
||||
NSData *data=[NSJSONSerialization dataWithJSONObject:@{@"width":@(w),@"height":@(h),@"runs":runs} options:NSJSONWritingPrettyPrinted error:nil];fwrite(data.bytes,1,data.length,stdout);return 0;
|
||||
}}
|
||||
@@ -0,0 +1,20 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#include "../../大鱼调色/Plugin/MaskCore/DYOpenCVTracker.hpp"
|
||||
#include "../../大鱼调色/Plugin/DYToolFlow.inc.h"
|
||||
static NSURL *testLibrary;
|
||||
namespace dy {
|
||||
class MetalTestTracker : public OpenCVTracker {
|
||||
public:
|
||||
MetalTestTracker(){auto flow=DYToolCreateMetalFlow(testLibrary,nullptr);if(!flow)throw std::runtime_error("Metal backend unavailable");setFlowBackend(flow);}
|
||||
};
|
||||
}
|
||||
#define OpenCVTracker MetalTestTracker
|
||||
#define main runMetalCases
|
||||
#include "verify_opencv_tracker.cpp"
|
||||
#undef main
|
||||
#undef OpenCVTracker
|
||||
int main(int argc,const char **argv){@autoreleasepool{
|
||||
if(argc!=2)return 2;
|
||||
testLibrary=[NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[1]]];
|
||||
return runMetalCases();
|
||||
}}
|
||||
@@ -75,5 +75,15 @@ int main() {
|
||||
auto ms=std::chrono::duration<double,std::milli>(std::chrono::steady_clock::now()-begin).count();
|
||||
std::cerr<<"4K generated images plus tracking: "<<ms<<"ms\n";
|
||||
}
|
||||
{
|
||||
dy::OpenCVTracker floats,bytes;bool ok=true;double difference=0;
|
||||
for(int i=0;i<12;++i){auto f=frame(640,480,1.25*i,.5*i);dy::GrayFrame b;b.width=f.width;b.height=f.height;
|
||||
b.bytes.resize(f.pixels.size());for(size_t p=0;p<f.pixels.size();++p){b.bytes[p]=uint8_t(std::lround(f.pixels[p]*255));f.pixels[p]=b.bytes[p]/255.f;}
|
||||
b.flipVertically();b.flipVertically();
|
||||
ok&=i?floats.track(f).valid&&bytes.track(b).valid:floats.reset(f,{.5,.5,.4,.4,0})&&bytes.reset(b,{.5,.5,.4,.4,0});
|
||||
auto a=floats.result(),c=bytes.result();difference=std::max(difference,std::hypot(double(a.cx-c.cx)*640,double(a.cy-c.cy)*480));
|
||||
}
|
||||
check("compact-gpu-byte-input-matches-quantized-float-and-flip",ok&&difference<1e-5,difference);
|
||||
}
|
||||
std::cout<<"],\"pass\":"<<(failed?"false":"true")<<",\"count\":"<<count<<",\"runtimeTargetAppUsed\":false}\n";return failed?1:0;
|
||||
}
|
||||
@@ -32,6 +32,30 @@ int main(int argc,char **argv){@autoreleasepool{
|
||||
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");
|
||||
NSDictionary *header=@{@"bundleID":@"com.dayu.color.XPC",@"app_version":@"1.10.0",@"build_version":@"72",@"timestamp":@"2026-11-05 10:00:00 +0800"};
|
||||
NSDictionary *body=@{@"faultingThread":@0,@"pid":@123,@"exception":@{@"type":@"EXC_BAD_ACCESS",@"signal":@"SIGSEGV"},
|
||||
@"termination":@{@"namespace":@"DYLD",@"code":@1,@"details":@[@"Library not loaded: /Users/private/movie.mov"]},
|
||||
@"usedImages":@[@{@"name":@"大鱼调色 XPC Service",@"uuid":@"12345678-1234-4234-8234-123456789012",@"path":@"/Users/private/test.app"}],
|
||||
@"threads":@[@{@"frames":@[@{@"imageIndex":@0,@"imageOffset":@456},@{@"symbol":@"DYRenderer",@"imageIndex":@0,@"imageOffset":@789}]}]};
|
||||
NSDictionary *evidence=DYBetaCrashEvidence(header,body);
|
||||
check([evidence[@"source_version"]isEqual:@"1.10.0"]&&[evidence[@"source_build"]isEqual:@"72"],@"crashed version independent from uploader");
|
||||
check([evidence[@"frames"]containsString:@"456"]&&[evidence[@"frames"]containsString:@"12345678-1234-4234-8234-123456789012"],@"unsymbolicated frames preserve UUID and offset");
|
||||
check([evidence[@"status"]isEqual:@"library_missing"]&&![[evidence description]containsString:@"private"],@"dyld classification without user paths");
|
||||
check(DYBetaCrashEvidence(@{@"bundleID":@"com.apple.FinalCut"},body)==nil,@"no collection from unrelated host");
|
||||
NSMutableDictionary *dev=[[body mutableCopy]autorelease];dev[@"threads"]=@[@{@"frames":@[@{@"symbol":@"DYRunDiagnostics"}]}];
|
||||
check(DYBetaCrashEvidence(header,dev)==nil,@"development crashes excluded");
|
||||
dev[@"threads"]=@[@{@"frames":@[@{@"symbol":@"__asan_report_load8"}]}];check(DYBetaCrashEvidence(header,dev)==nil,@"sanitizer crashes excluded");
|
||||
check(DYBetaCrashEvidence((id)@[],(id)@[])==nil,@"malformed report safely rejected");
|
||||
NSString *sample=@"Path: /Users/private/sample.app\nCall graph:\n 10 Thread_1 DispatchQueue_1: com.apple.main-thread\n + 10 _dispatch_semaphore_wait_slow (in libdispatch.dylib) + 4 [0x1234]\n + 10 private (in /Users/private/secret)\n 10 Thread_2\n + 10 DYRenderer (in 大鱼调色 XPC Service) + 32 [0x1234]\nBinary Images:\n/Users/private/media.mov";
|
||||
NSString *sampleFrames=DYBetaSampleFrames(sample);
|
||||
check([sampleFrames containsString:@"_dispatch_semaphore_wait_slow"]&&[sampleFrames containsString:@"DYRenderer"]&&![sampleFrames containsString:@"private"],@"sample extracts call graph only");
|
||||
check(DYBetaSampleFrames(@"sampling denied").length==0,@"unavailable sampling stays explicit");
|
||||
NSError *missing=[NSError errorWithDomain:NSCocoaErrorDomain code:260 userInfo:@{NSFilePathErrorKey:@"/Users/private/look.cube"}];
|
||||
NSDictionary *errorFields=DYBetaErrorFields(missing,@"render_source");
|
||||
check([errorFields[@"resource_kind"]isEqual:@"cube"]&&![[errorFields description]containsString:@"private"],@"missing LUT classified without filename");
|
||||
double started=NSProcessInfo.processInfo.systemUptime;
|
||||
for(int i=0;i<10000;i++)DYBetaSpanEnd(DYBetaSpanBegin(@"render",nil),nil);
|
||||
check(NSProcessInfo.processInfo.systemUptime-started<1,@"disabled test process avoids per-frame work and transport");
|
||||
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");
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"articleID": 15792,
|
||||
"url": "https://dayu.media/15792/",
|
||||
"status": "publish",
|
||||
"title": "大鱼调色 1.18.0 公测版|后台自动诊断与多目标马赛克",
|
||||
"version": "1.18.0",
|
||||
"build": 105,
|
||||
"requestID": "dayu-color-1180-build105-article15792-20261106",
|
||||
"payloadSHA256": "e4bd25d0833e956215d9fde951be0b45cfea8ac379bbc9e8e4e046795eea928a",
|
||||
"changedResourceFields": [
|
||||
"cao_downurl",
|
||||
"cao_original_filename"
|
||||
],
|
||||
"featuredMedia": 15863,
|
||||
"authorCategoriesTagsPreserved": true,
|
||||
"commercialAndVideoFieldsPreserved": true,
|
||||
"priceYuan": "50",
|
||||
"memberRate": "0",
|
||||
"fcpxSettingsPreserved": true,
|
||||
"frontendChecks": [
|
||||
{
|
||||
"url": "https://dayu.media/15792/",
|
||||
"http": 200,
|
||||
"currentVersionVisible": true,
|
||||
"seoSingleAndExact": true,
|
||||
"oldImagesPreserved": true,
|
||||
"paidPackageURLAbsent": true
|
||||
},
|
||||
{
|
||||
"url": "https://dayu.media/15792/?release-check=1.18.0-105",
|
||||
"http": 200,
|
||||
"currentVersionVisible": true,
|
||||
"seoSingleAndExact": true,
|
||||
"oldImagesPreserved": true,
|
||||
"paidPackageURLAbsent": true
|
||||
}
|
||||
],
|
||||
"package": {
|
||||
"downloadName": "大鱼调色-1.18.0.pkg",
|
||||
"http": 200,
|
||||
"bytes": 46620783,
|
||||
"sha256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"downloadedTicketValidated": true,
|
||||
"byteIdenticalToOfficialPKG": true
|
||||
},
|
||||
"purchaseFlow": "Saved main download URL fetched in full without placing an order.",
|
||||
"filenameRequestID": "dayu-color-1180-build105-article15792-filename-20261106"
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-beta.php",
|
||||
"sha256": "d2b73816e871765bc2f7d1604a1beda98b99e2d9ac4f62039de7bf3a81107593",
|
||||
"backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-beta-202611021738.phpbak",
|
||||
"size": 14220,
|
||||
"timestamp": "202611021738",
|
||||
"sha256": "08c15754c07c09984f3ecc00cac802bcab2ef7dc1bf0bf6f4600af7e7294b8eb",
|
||||
"backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-beta-202611061649.phpbak",
|
||||
"size": 15008,
|
||||
"timestamp": "202611061649",
|
||||
"mount": "//dayu@192.168.31.21/dayumedia%20%28%E5%AD%98%E5%82%A8%E7%A9%BA%E9%97%B41%29 on /Volumes/dayumedia (存储空间1) (smbfs, nodev, nosuid, mounted by mac)",
|
||||
"localProject": "/Users/mac/Downloads/dayumedia/dayu-color-beta",
|
||||
"sourceCommit": "e37330a4b5a1ad8c10a05fbc6cd3c37be87dc530"
|
||||
"sourceCommit": "2b2a98d6658f7dc09f0b2c91a3c7bef9f7682a4f"
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"passed": true,
|
||||
"checked_at": "2026-11-02T09:40:25.115993+00:00",
|
||||
"checked_at": "2026-11-06T08:49:49.654581+00:00",
|
||||
"checks": [
|
||||
"update GET",
|
||||
"product isolation",
|
||||
@@ -9,21 +9,21 @@
|
||||
"retry same UUID ACK",
|
||||
"foreign upload denied"
|
||||
],
|
||||
"test_event_id": "fe84a41b-84a4-41f8-ba22-afd62655506e",
|
||||
"test_installation_id": "c1f91498-dda9-4219-bb86-decaba573e18",
|
||||
"test_event_id": "58c48897-fb01-4ad5-923e-b118d13d561b",
|
||||
"test_installation_id": "9f2ba0ca-abca-4a8d-b229-c01312f35aa0",
|
||||
"update": {
|
||||
"bundle_id": "com.dayu.color",
|
||||
"channel": "beta",
|
||||
"version": "1.7.0",
|
||||
"build": 45,
|
||||
"version": "1.12.0",
|
||||
"build": 79,
|
||||
"package_type": "pkg",
|
||||
"install_mode": "pkg_installer",
|
||||
"size": 40898751,
|
||||
"sha256": "a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb",
|
||||
"download_url": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg",
|
||||
"size": 45329742,
|
||||
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe",
|
||||
"download_url": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-12-0-79.pkg",
|
||||
"minimum_system_version": "14.6",
|
||||
"notes": "公测版:接入自动更新与可关闭的云端诊断,记录插件加载耗时及错误摘要。请保存并退出 FCP / Motion 后安装。",
|
||||
"notes": "1.12.0 公测版加入统一调色工作区、共享蒙版、最近使用 LUT 和四宫格示波器。画布工具移至左下角,改善检视器重开与片尾示波器加载。请保存项目并退出 Final Cut Pro 和 Motion 后安装。",
|
||||
"update_available": true,
|
||||
"checked_at": "2026-11-02T09:40:23+00:00"
|
||||
"checked_at": "2026-11-06T08:49:47+00:00"
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,31 @@
|
||||
{
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg",
|
||||
"sha256": "a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb",
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-18-0-105.pkg",
|
||||
"sha256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"backup": null,
|
||||
"size": 40898751,
|
||||
"size": 46620783,
|
||||
"manifest": {
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta.json",
|
||||
"sha256": "30c92debf91de7ab8215b35dc64a4ddb764e53450c327ae53fb41a4c2f7a26c0",
|
||||
"backup": null,
|
||||
"size": 558
|
||||
"sha256": "c4f1de672529eccbf78145b1e4c61f4e02354cdeec7f0041472f76c609a32268",
|
||||
"backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta-202611061726.jsonbak",
|
||||
"size": 666
|
||||
},
|
||||
"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"
|
||||
"version": "1.18.0",
|
||||
"build": 105,
|
||||
"downloadURL": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-18-0-105.pkg",
|
||||
"timestamp": "202611061726",
|
||||
"httpManifestVerified": true,
|
||||
"httpFullDownloadBytes": 46620783,
|
||||
"httpFullDownloadSHA256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"updateAPIChecks": [
|
||||
{
|
||||
"currentBuild": 95,
|
||||
"updateAvailable": true,
|
||||
"offeredBuild": 105
|
||||
},
|
||||
{
|
||||
"currentBuild": 105,
|
||||
"updateAvailable": false,
|
||||
"offeredBuild": 105
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
{
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-18-0-105.pkg",
|
||||
"sha256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"backup": null,
|
||||
"size": 46620783,
|
||||
"manifest": {
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta.json",
|
||||
"sha256": "c4f1de672529eccbf78145b1e4c61f4e02354cdeec7f0041472f76c609a32268",
|
||||
"backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta-202611061726.jsonbak",
|
||||
"size": 666
|
||||
},
|
||||
"version": "1.18.0",
|
||||
"build": 105,
|
||||
"downloadURL": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-18-0-105.pkg",
|
||||
"timestamp": "202611061726",
|
||||
"httpManifestVerified": true,
|
||||
"httpFullDownloadBytes": 46620783,
|
||||
"httpFullDownloadSHA256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"updateAPIChecks": [
|
||||
{
|
||||
"currentBuild": 95,
|
||||
"updateAvailable": true,
|
||||
"offeredBuild": 105
|
||||
},
|
||||
{
|
||||
"currentBuild": 105,
|
||||
"updateAvailable": false,
|
||||
"offeredBuild": 105
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"pass": true,
|
||||
"date": "2026-11-06",
|
||||
"version": "1.17.1",
|
||||
"build": "103",
|
||||
"removed": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/task-1.17.1/recovery",
|
||||
"/Volumes/备份/大鱼调色-1.17.1.pkg"
|
||||
],
|
||||
"generatedAlreadyRemoved": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/notarization-submission.zip"
|
||||
],
|
||||
"oldReplacementBackups": "absent",
|
||||
"packageInputStaging": "absent",
|
||||
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"knownTopLevelProductApps": [
|
||||
"/Library/Plug-Ins/FxPlug/大鱼调色.app"
|
||||
],
|
||||
"preserved": [
|
||||
"Current signed 1.17.1 release package",
|
||||
"User historical packages",
|
||||
"QA media and FCP library",
|
||||
"Preexisting project.pbxproj diff",
|
||||
"Task diagnostics and baseline patch"
|
||||
],
|
||||
"scope": "Known product installation/build paths and task-created recovery/download copies; not a whole-machine scan"
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"removed": [
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-45dca8475efb4d6cb133b14d45d8372b.app",
|
||||
"/Users/mac/Downloads/大鱼调色-1.18.0.pkg",
|
||||
"/Users/mac/Downloads/大鱼调色-1.18.0-symbols.zip",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-1.18.0-t7a2_vg1",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/diagnostic-sample-check.txt",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/task-poll-check.m",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/task-poll-check",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/candidate104-symbols.zip",
|
||||
"/tmp/dayu-diagnostics-edit.py",
|
||||
"/Users/mac/Downloads/dayumedia/dayu-color-beta/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-18-0-105.pkg"
|
||||
],
|
||||
"scope": "Current product cache, current project, standard installation folders, top-level Desktop/Downloads; no whole-disk claim.",
|
||||
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"version": "1.18.0",
|
||||
"build": 105,
|
||||
"registryEntries": 1,
|
||||
"generatedAppAndNotaryZipRemoved": true,
|
||||
"temporarySampleFiles": 0,
|
||||
"kept": [
|
||||
"Current signed PKG and matching symbols ZIP",
|
||||
"User historical releases",
|
||||
"Source files and QA library",
|
||||
"Published NAS package and scoped beta manifest; only local upload staging PKG removed"
|
||||
],
|
||||
"productLock": "released on exit"
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.17.1",
|
||||
"build": "103",
|
||||
"version": "1.18.1",
|
||||
"build": "106",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "36ecb7e6-5cfc-4b85-8363-11272d880b18",
|
||||
"notaryID": "2c4e6cba-8178-4a50-9198-83e66be37add",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "3b4c612edf99c0ef2b972b7305cd7ba44244a7c6",
|
||||
"sourceCommit": "1cc7f8edb2acb3cfc62bd72447c2956ad7a01601",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
@@ -64,6 +64,6 @@
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "443ef7e178a5bbd6418a4d2eaac5d42f023f1a6a0a5c4ddd54c7c831af50eb6a",
|
||||
"hostVerification": "verification/HostInspectorMosaic1.17.1.json"
|
||||
"shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793",
|
||||
"hostVerification": "verification/HostTrackingUI1.18.1.json"
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
"status": "installed-awaiting-host-verification",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.18.0",
|
||||
"build": "104",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "d766ba9e-dcb5-462a-9497-83505e7dd239",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "e26a7c68e46bbd3f65f6052056d25a12f154123e",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "443ef7e178a5bbd6418a4d2eaac5d42f023f1a6a0a5c4ddd54c7c831af50eb6a",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-45dca8475efb4d6cb133b14d45d8372b.app"
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
{
|
||||
"version": "1.18.0",
|
||||
"build": 105,
|
||||
"offlineClientChecks": 75,
|
||||
"backendContractChecks": 27,
|
||||
"appSyntax": "passed",
|
||||
"productionBaselineSHA256": "d2b73816e871765bc2f7d1604a1beda98b99e2d9ac4f62039de7bf3a81107593",
|
||||
"scope": [
|
||||
"crash original version/build",
|
||||
"unsymbolicated UUID and offset",
|
||||
"development crash exclusion",
|
||||
"sample stack-only privacy",
|
||||
"resource category without filename",
|
||||
"new server allowlist"
|
||||
],
|
||||
"formalRuntimeValidation": {
|
||||
"hangProbe": {
|
||||
"pass": true,
|
||||
"occurredUTC": "2026-11-06 09:17:01",
|
||||
"deliveredUTC": "2026-11-06 09:17:02",
|
||||
"phase": "verification",
|
||||
"sample_status": "captured",
|
||||
"verifiedFrames": [
|
||||
"-[AppDelegate runDiagnosticsProbe] AppDelegate.m:163",
|
||||
"+[NSThread sleepForTimeInterval:]",
|
||||
"nanosleep",
|
||||
"__semwait_signal"
|
||||
],
|
||||
"duration": "Intentional 12-second wrapper-only main-thread stall; host untouched",
|
||||
"rawSampleFile": "Removed after extraction; only stack summary sent"
|
||||
},
|
||||
"ordinaryBackgroundRun": {
|
||||
"pass": true,
|
||||
"closedWindowLocal": "around 17:19:43",
|
||||
"continuedDeliveryUTC": [
|
||||
"09:20:42",
|
||||
"09:21:45"
|
||||
],
|
||||
"sameProcess": true,
|
||||
"probeArgumentAbsent": true,
|
||||
"mainIdleResourceSample": {
|
||||
"memoryMB": 96.8125,
|
||||
"cpuPercent": 0.0006506293332152795,
|
||||
"threads": 5
|
||||
},
|
||||
"scope": "Short local observation, not long-duration soak test"
|
||||
},
|
||||
"diagnosticToggle": {
|
||||
"pass": true,
|
||||
"disabledWindowLocal": "17:17:47–17:19 (over 60 seconds)",
|
||||
"latestCloudEventBeforeReenableUTC": "09:17:36",
|
||||
"localJournalEventsWhileDisabled": 0,
|
||||
"UI": "queue cleared, send button disabled; original enabled setting restored",
|
||||
"pluginAtStartup": "no events emitted while disabled"
|
||||
},
|
||||
"host105": {
|
||||
"pass": true,
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"pluginDisplayVersion": "1.18.0",
|
||||
"installedExecutable": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service",
|
||||
"playback": "Existing 11.4-second clip played to end; no new host crash observed",
|
||||
"renderInput": [
|
||||
3840,
|
||||
2160
|
||||
],
|
||||
"renderSummary": {
|
||||
"count": 28,
|
||||
"averageMS": 601.407418150172,
|
||||
"maxMS": 1716.7992916656658
|
||||
},
|
||||
"pluginStateSummary": {
|
||||
"count": 41,
|
||||
"averageMS": 4.306948178720365,
|
||||
"maxMS": 8.675583347212523
|
||||
},
|
||||
"finding": "Slow source rendering observed; not a frame-rate benchmark or a completed performance fix. No footage or filenames stored."
|
||||
}
|
||||
},
|
||||
"candidate104": {
|
||||
"hostPlayback": "passed",
|
||||
"performanceSummary": "render/plugin_state/inspector_refresh reached cloud",
|
||||
"hangProbe": "timeout_or_disabled; not accepted for release",
|
||||
"correction": "sample before symbolication, 30-second background deadline"
|
||||
},
|
||||
"installedNativeChecks": 961,
|
||||
"actualCompiledSource": "d0187695581fa3a8fe5c3cfa8a1bc6337425f5f6",
|
||||
"pass": true
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"pass": true,
|
||||
"releaseID": 400,
|
||||
"assetID": 44,
|
||||
"url": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.17.1-inspector-mosaic-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.17.1.pkg",
|
||||
"downloadPath": "/Volumes/备份/大鱼调色-1.17.1.pkg",
|
||||
"bytes": 46600407,
|
||||
"sha256": "5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710",
|
||||
"method": "Authenticated Edge draft asset download; completed UI download and independent file SHA-256; staple validate passed"
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"version": "1.18.1",
|
||||
"build": 106,
|
||||
"compiledSource": "1cc7f8edb2acb3cfc62bd72447c2956ad7a01601",
|
||||
"installedPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"host": "Final Cut Pro",
|
||||
"qaProject": "1.18.1 追踪与界面验收",
|
||||
"originalProjectPreserved": true,
|
||||
"checks": {
|
||||
"installedNativeSelfTest": 964,
|
||||
"uiVersion": "1.18.1",
|
||||
"forwardTrackingCompletedFrames": 285,
|
||||
"secondHeadROICompletedFrames": 285,
|
||||
"workspaceModuleSwitch": true,
|
||||
"exposureChangeAndReset": true,
|
||||
"maskEditAndClearOnDuplicate": true,
|
||||
"scrollInputAccepted": true
|
||||
},
|
||||
"limitations": [
|
||||
"No end-to-end timing or UI latency percentile measured.",
|
||||
"Head mask drifts during turn despite completion. Baseline and optimized algorithm produce identical trajectories on caller-decoded clip; no accuracy improvement claim.",
|
||||
"APP installed and verified by formal delivery workflow; PKG installer not rerun."
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"checks": 961,
|
||||
"checks": 964,
|
||||
"gpu": "Apple M4",
|
||||
"limitations": [
|
||||
"Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.",
|
||||
@@ -12,7 +12,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "runtime-directory",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B"
|
||||
},
|
||||
{
|
||||
"descriptors": 285,
|
||||
@@ -898,7 +898,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -918,7 +918,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 1,
|
||||
"maximumGapMS": 86.95504162460566,
|
||||
"maximumGapMS": 92.47249999316409,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -968,6 +968,14 @@
|
||||
"name": "instance-proxy-batches-multiple-fields-without-clobber",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "layer-snapshot-read-after-write-in-one-action",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "layer-snapshot-next-action-sees-external-edit",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "two-native-hsl-panels-with-mask-and-repeat-buttons",
|
||||
"pass": true
|
||||
@@ -1389,7 +1397,7 @@
|
||||
"closePixels": 128,
|
||||
"name": "workspace-offscreen-compact-icons-and-close-render-pixels",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/workspace-topbar.png",
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/workspace-topbar.png",
|
||||
"toolbarPixels": 3867
|
||||
},
|
||||
{
|
||||
@@ -1460,7 +1468,7 @@
|
||||
},
|
||||
{
|
||||
"name": "workspace-independent-style-fixture-inserted",
|
||||
"node": "46D9AE5A-65F4-42B7-9DEA-627A58B5B8B7",
|
||||
"node": "CE2B332D-C86F-407E-AE35-C2736E2193CE",
|
||||
"pass": true,
|
||||
"validDocument": true
|
||||
},
|
||||
@@ -1469,10 +1477,10 @@
|
||||
"error": "none",
|
||||
"name": "workspace-independent-style1-writes-target-node-inside-undo",
|
||||
"nodePaths": {
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/node.cube"
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/node.cube"
|
||||
},
|
||||
"pass": true,
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/user-new.cube",
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/user-new.cube",
|
||||
"undoStartsAfter": 3,
|
||||
"undoStartsBefore": 2,
|
||||
"written": true
|
||||
@@ -2741,11 +2749,17 @@
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"maximumError": 7.175931748815145e-08,
|
||||
"maximumError": 1.2154672712760828e-08,
|
||||
"name": "tracking-4k-frame-preserves-full-detail-for-opencv",
|
||||
"pass": true,
|
||||
"width": 3840
|
||||
},
|
||||
{
|
||||
"name": "tracking-metal-gray8-compact-readback-matches-float-reference",
|
||||
"pass": true,
|
||||
"previousReadbackBytes": 33177600,
|
||||
"readbackBytes": 8294400
|
||||
},
|
||||
{
|
||||
"name": "shared-tracking-same-mask-switches-global-hsl-spider-without-interruption",
|
||||
"pass": true
|
||||
@@ -4414,7 +4428,7 @@
|
||||
{
|
||||
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/viewer-workspace.png"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/viewer-workspace.png"
|
||||
},
|
||||
{
|
||||
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
|
||||
@@ -4813,6 +4827,6 @@
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B",
|
||||
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
"date": "2026-11-06",
|
||||
"timezone": "Asia/Shanghai",
|
||||
"recentUserReport": "User saw host disappear and then agreed it likely corresponded to our normal quit.",
|
||||
"systemEvidence": [
|
||||
{
|
||||
"time": "16:48:30",
|
||||
"pid": 77285,
|
||||
"termination": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"time": "17:03:55",
|
||||
"pid": 83505,
|
||||
"termination": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"time": "17:06:52",
|
||||
"pid": 83858,
|
||||
"termination": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
],
|
||||
"newCrashReport": false,
|
||||
"conclusion": "Recent observed exits match the normal Cmd-Q verification actions; do not count as crashes.",
|
||||
"olderCrash": {
|
||||
"captureTime": "2026-11-06 10:30:52 +0800",
|
||||
"host": "Final Cut Pro 12.4 (454072)",
|
||||
"exception": "EXC_CRASH / SIGABRT",
|
||||
"faultingThread": 20,
|
||||
"frames": [
|
||||
"pcAbortImpl",
|
||||
"-[POOnScreenControl renderWithDrawProperties:]",
|
||||
"-[FFProOSC drawRect:toContext:drawProperties:]",
|
||||
"-[FFPlayerVideoModule drawOSCsAtTime:inRect:drawDestination:drawProperties:isDisplaying:]"
|
||||
],
|
||||
"mainThread": "-[FFInspectorModuleChannels _setupChannelInspector:] / _filtersChangedFinal removes NSScrollView",
|
||||
"scope": "Host screen-control rendering aborted while inspector was rebuilding. No Dayu frames in the host report; insufficient to attribute to a specific plugin. Predates this diagnostic change."
|
||||
},
|
||||
"rawReport": "Kept only in system DiagnosticReports/Retired; not uploaded or committed."
|
||||
}
|
||||
@@ -0,0 +1,225 @@
|
||||
{
|
||||
"scope": "Identical synthetic full-resolution CPU/Metal comparison. Candidate not installed.",
|
||||
"initial": {
|
||||
"cases": [
|
||||
{
|
||||
"width": 640,
|
||||
"height": 480,
|
||||
"roi": 0.12,
|
||||
"frames": 12,
|
||||
"cpuMs": 30.007459,
|
||||
"metalMs": 32.543915,
|
||||
"cpuErrorPx": 0.014766356,
|
||||
"metalErrorPx": 0.015058941,
|
||||
"differencePx": 0.001211279,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 640,
|
||||
"height": 480,
|
||||
"roi": 0.69999999,
|
||||
"frames": 12,
|
||||
"cpuMs": 69.944751,
|
||||
"metalMs": 65.5695,
|
||||
"cpuErrorPx": 0.0059646107,
|
||||
"metalErrorPx": 0.0061500019,
|
||||
"differencePx": 0.00032044025,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"roi": 0.12,
|
||||
"frames": 12,
|
||||
"cpuMs": 158.51942,
|
||||
"metalMs": 157.27908,
|
||||
"cpuErrorPx": 0.010653597,
|
||||
"metalErrorPx": 0.010528938,
|
||||
"differencePx": 0.00073837814,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"roi": 0.69999999,
|
||||
"frames": 12,
|
||||
"cpuMs": 189.76521,
|
||||
"metalMs": 197.53042,
|
||||
"cpuErrorPx": 0.0044298672,
|
||||
"metalErrorPx": 0.0043980019,
|
||||
"differencePx": 0.00028177808,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 3840,
|
||||
"height": 2160,
|
||||
"roi": 0.12,
|
||||
"frames": 12,
|
||||
"cpuMs": 523.4585,
|
||||
"metalMs": 481.38763,
|
||||
"cpuErrorPx": 0.0058081044,
|
||||
"metalErrorPx": 0.0058169868,
|
||||
"differencePx": 0.00047552405,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 3840,
|
||||
"height": 2160,
|
||||
"roi": 0.69999999,
|
||||
"frames": 12,
|
||||
"cpuMs": 626.79046,
|
||||
"metalMs": 593.42783,
|
||||
"cpuErrorPx": 0.00352694,
|
||||
"metalErrorPx": 0.00352694,
|
||||
"differencePx": 0.00034451278,
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"pass": true
|
||||
},
|
||||
"cropped": {
|
||||
"cases": [
|
||||
{
|
||||
"width": 640,
|
||||
"height": 480,
|
||||
"roi": 0.12,
|
||||
"frames": 12,
|
||||
"cpuMs": 17.140793,
|
||||
"metalMs": 23.460209,
|
||||
"cpuErrorPx": 0.014766356,
|
||||
"metalErrorPx": 0.015058941,
|
||||
"differencePx": 0.001211279,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 640,
|
||||
"height": 480,
|
||||
"roi": 0.69999999,
|
||||
"frames": 12,
|
||||
"cpuMs": 63.894127,
|
||||
"metalMs": 65.146207,
|
||||
"cpuErrorPx": 0.0059646107,
|
||||
"metalErrorPx": 0.0061500019,
|
||||
"differencePx": 0.00032044025,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"roi": 0.12,
|
||||
"frames": 12,
|
||||
"cpuMs": 69.389456,
|
||||
"metalMs": 63.493252,
|
||||
"cpuErrorPx": 0.010653597,
|
||||
"metalErrorPx": 0.010528938,
|
||||
"differencePx": 0.00073837814,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"roi": 0.69999999,
|
||||
"frames": 12,
|
||||
"cpuMs": 156.90271,
|
||||
"metalMs": 159.282,
|
||||
"cpuErrorPx": 0.0044298672,
|
||||
"metalErrorPx": 0.0043980019,
|
||||
"differencePx": 0.00028177808,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 3840,
|
||||
"height": 2160,
|
||||
"roi": 0.12,
|
||||
"frames": 12,
|
||||
"cpuMs": 186.95491,
|
||||
"metalMs": 161.89333,
|
||||
"cpuErrorPx": 0.0058081044,
|
||||
"metalErrorPx": 0.0058169868,
|
||||
"differencePx": 0.00047552405,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"width": 3840,
|
||||
"height": 2160,
|
||||
"roi": 0.69999999,
|
||||
"frames": 12,
|
||||
"cpuMs": 553.42904,
|
||||
"metalMs": 426.87983,
|
||||
"cpuErrorPx": 0.00352694,
|
||||
"metalErrorPx": 0.00352694,
|
||||
"differencePx": 0.00034451278,
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"pass": true
|
||||
},
|
||||
"metalRegression": {
|
||||
"version": "4.5.1",
|
||||
"checks": [
|
||||
{
|
||||
"name": "pinned-public-opencv-version",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "300-feature-capacity",
|
||||
"pass": true,
|
||||
"error": 300
|
||||
},
|
||||
{
|
||||
"name": "translation-rotation-independent-xy-scale",
|
||||
"pass": true,
|
||||
"error": 0.00257472
|
||||
},
|
||||
{
|
||||
"name": "free-path-outside-creation-box-12-frame-subpixel",
|
||||
"pass": true,
|
||||
"error": 0.014958
|
||||
},
|
||||
{
|
||||
"name": "periodic-redetection-keeps-static-position",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "unrelated-cut-stops-with-last-trusted-position",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "flat-mask-rejected",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "moving-majority-prefers-subject-over-static-background",
|
||||
"pass": true,
|
||||
"error": 0.0010376
|
||||
},
|
||||
{
|
||||
"name": "independent-tracker-objects-do-not-share-motion",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "invalid-frame-preserves-authored-geometry",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "nonfinite-source-rejected",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "4k-complete-source-frame",
|
||||
"pass": true,
|
||||
"error": 0.000107325
|
||||
}
|
||||
],
|
||||
"pass": true,
|
||||
"count": 12,
|
||||
"runtimeTargetAppUsed": false
|
||||
}
|
||||
}
|
||||
+32
-16
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.17.1.pkg",
|
||||
"sha256": "5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710",
|
||||
"bytes": 46600407,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.18.1.pkg",
|
||||
"sha256": "e149555c46cc6196eb12601196d70121d79b796be852f9a2e89688b20483a6b2",
|
||||
"bytes": 46654687,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
@@ -31,28 +31,44 @@
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.17.1",
|
||||
"build": "103"
|
||||
"version": "1.18.1",
|
||||
"build": "106"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-nf5zk7ii/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.11872d63-c02b-4e61-932f-b4f5ce5da14d/663E69E0-6C24-4560-9502-0086DA22CC8F/大鱼调色"
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-8k31x1xh/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.578b9ec4-8e23-4be6-875d-0f7618eadeb2/8AED9EE9-3902-4868-A9EA-5B08ACF4A1B2/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.17.1.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-06 08:12:29 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.17.1.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"signature": "Package \"大鱼调色-1.18.1.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-06 10:16:43 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.18.1.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"name": "大鱼调色-1.17.1.pkg",
|
||||
"status": "Accepted",
|
||||
"id": "8e122236-9ca6-4d92-ad6a-b9c2411280e7",
|
||||
"message": "Successfully received submission info",
|
||||
"createdDate": "2026-11-06T08:12:30.949Z"
|
||||
"id": "5b0f2573-e603-49a5-91b6-fa0582c8c782",
|
||||
"status": "Accepted",
|
||||
"createdDate": "2026-11-06T10:16:44.681Z",
|
||||
"name": "大鱼调色-1.18.1.pkg"
|
||||
},
|
||||
"appCompiledSource": "3b4c612edf99c0ef2b972b7305cd7ba44244a7c6",
|
||||
"appBuild": "103",
|
||||
"appCompiledSource": "1cc7f8edb2acb3cfc62bd72447c2956ad7a01601",
|
||||
"appBuild": "106",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"residentAppClosing": {
|
||||
"identifiers": [
|
||||
"com.apple.FinalCut",
|
||||
"com.apple.FinalCutApp",
|
||||
"com.apple.motionapp",
|
||||
"com.apple.motionappApp",
|
||||
"com.dayu.color"
|
||||
],
|
||||
"preinstallGuardCount": 1,
|
||||
"normalQuit": true
|
||||
},
|
||||
"packageEntryAdaptation": {
|
||||
"upstreamEntrySHA256": "a1a8bc8920cfa2dfe4a7d65c4403eec8a8f3ec81b0736951578a81a80389bfc0",
|
||||
"adaptedEntrySHA256": "4d9cef08673a690427de0757a5cfe42251d01aa47e40902a5155d46d01c71503",
|
||||
"requiredApplication": "com.dayu.color"
|
||||
},
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
@@ -111,6 +127,6 @@
|
||||
"entries": 198,
|
||||
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostInspectorMosaic1.17.1.json",
|
||||
"installedAppHostAcceptance": "verification/HostTrackingUI1.18.1.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -16,5 +16,25 @@
|
||||
"templateChecks": "16 standalone and full effect passed; existing templates byte-identical",
|
||||
"unrelatedDiff": "project.pbxproj three Security reference reorderings preserved"
|
||||
},
|
||||
"scope": "Independent remote checkout and all tracked blobs; no third-party cold rebuild; release tag recovery pending"
|
||||
"scope": "Independent remote checkout of compiled source and release tag; every tracked file checked against its Git blob; package record matched. No third-party cold rebuild.",
|
||||
"release": {
|
||||
"tag": "v1.17.1-inspector-mosaic-20261106",
|
||||
"commit": "7c0bfa5352f282bcec0aedf43be29af4432f2ba8",
|
||||
"files": 718,
|
||||
"fsck": "passed",
|
||||
"packageRecord": "matches exact signed package",
|
||||
"changesFromCompiledCommit": [
|
||||
"Publishing/1.17.1/Release.md",
|
||||
"RECOVERY.md",
|
||||
"research/InspectorMosaic1.17.1.md",
|
||||
"template/sources/RegisteredParameters.json",
|
||||
"verification/Delivery.json",
|
||||
"verification/HostInspectorMosaic1.17.1.json",
|
||||
"verification/InspectorMosaic1.17.1.json",
|
||||
"verification/InstalledSelfTest.json",
|
||||
"verification/Package.json",
|
||||
"verification/Recovery1.17.1.json",
|
||||
"开发交接.md"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"sourceCommit": "d0187695581fa3a8fe5c3cfa8a1bc6337425f5f6",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"compiledSourceFilesVerified": 724,
|
||||
"fsck": "passed",
|
||||
"lfs": "no LFS pointers",
|
||||
"submodules": "none",
|
||||
"scope": "Independent remote clone, exact committed file bytes; third-party cold build not repeated",
|
||||
"releaseTag": "v1.18.0-diagnostics-20261106",
|
||||
"sourceByteComparison": "passed",
|
||||
"releaseCommit": "a03a056bff17daadce77128f767a08e98dc830dd",
|
||||
"releaseFilesVerified": 728,
|
||||
"releaseByteComparison": "passed",
|
||||
"preexistingWorkingTreeDifference": "Unrelated Security.framework reference ordering in project.pbxproj was preserved and not committed. No runtime source differences.",
|
||||
"cleanup": "temporary clone removed after exact source/tag verification"
|
||||
}
|
||||
+36
-19
@@ -1,26 +1,43 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.17.0-unified-mosaic-20261106",
|
||||
"releaseCommit": "a458bbeb5397153a458706b0bfbb4e8692108a65",
|
||||
"releaseID": 399,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.17.0-unified-mosaic-20261106",
|
||||
"releaseID": 401,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.18.0-diagnostics-20261106",
|
||||
"tag": "v1.18.0-diagnostics-20261106",
|
||||
"releaseCommit": "a03a056bff17daadce77128f767a08e98dc830dd",
|
||||
"draft": false,
|
||||
"prerelease": true,
|
||||
"assetID": 43,
|
||||
"assetName": "大鱼调色-1.17.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.17.0-unified-mosaic-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.17.0.pkg",
|
||||
"bytes": 46594729,
|
||||
"sha256": "f372ee6a421f833c4619dcc4891ae66f90b56f40b431ee75529806bec762157e",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Full draft download checked before publication; published attachment downloaded and checked again; release, tag and asset read-back verified.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.17.0.pkg",
|
||||
"sha256": "f372ee6a421f833c4619dcc4891ae66f90b56f40b431ee75529806bec762157e",
|
||||
"bytes": 46594729,
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.17.0-unified-mosaic-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.17.0.pkg",
|
||||
"canonicalDownloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.17.0-unified-mosaic-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.17.0.pkg"
|
||||
}
|
||||
"assets": [
|
||||
{
|
||||
"assetID": 45,
|
||||
"assetName": "大鱼调色-1.18.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/attachments/22e5cbb9-e51d-4808-b696-dc840c546fc2",
|
||||
"bytes": 46620783,
|
||||
"sha256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"verifiedDownload": true,
|
||||
"draftVerification": "Authenticated browser download; full byte count and SHA-256 matched before publication",
|
||||
"publishedVerification": "Published attachment full download byte count and SHA-256 matched"
|
||||
},
|
||||
{
|
||||
"assetID": 46,
|
||||
"assetName": "大鱼调色-1.18.0-symbols.zip",
|
||||
"downloadURL": "https://dayu.media/git/attachments/b6e5d7b6-1454-4295-8433-3ad407137458",
|
||||
"bytes": 3562272,
|
||||
"sha256": "a5bf3a6cc836c5da0471d9a70d2eb9e81a5166c63bbfae993a910ba859936c9c",
|
||||
"verifiedDownload": true,
|
||||
"draftVerification": "Authenticated browser download; full byte count and SHA-256 matched before publication",
|
||||
"publishedVerification": "Published attachment full download byte count and SHA-256 matched"
|
||||
}
|
||||
],
|
||||
"passResult": true,
|
||||
"verification": "Both draft assets downloaded through authenticated browser and verified before publishing; both published assets downloaded and verified again; metadata read back.",
|
||||
"assetID": 45,
|
||||
"assetName": "大鱼调色-1.18.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/attachments/22e5cbb9-e51d-4808-b696-dc840c546fc2",
|
||||
"bytes": 46620783,
|
||||
"sha256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"draftVerification": "Authenticated browser download; full byte count and SHA-256 matched before publication",
|
||||
"publishedVerification": "Published attachment full download byte count and SHA-256 matched"
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"releaseID": 401,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.18.0-diagnostics-20261106",
|
||||
"tag": "v1.18.0-diagnostics-20261106",
|
||||
"releaseCommit": "a03a056bff17daadce77128f767a08e98dc830dd",
|
||||
"draft": false,
|
||||
"prerelease": true,
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"assets": [
|
||||
{
|
||||
"assetID": 45,
|
||||
"assetName": "大鱼调色-1.18.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/attachments/22e5cbb9-e51d-4808-b696-dc840c546fc2",
|
||||
"bytes": 46620783,
|
||||
"sha256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"verifiedDownload": true,
|
||||
"draftVerification": "Authenticated browser download; full byte count and SHA-256 matched before publication",
|
||||
"publishedVerification": "Published attachment full download byte count and SHA-256 matched"
|
||||
},
|
||||
{
|
||||
"assetID": 46,
|
||||
"assetName": "大鱼调色-1.18.0-symbols.zip",
|
||||
"downloadURL": "https://dayu.media/git/attachments/b6e5d7b6-1454-4295-8433-3ad407137458",
|
||||
"bytes": 3562272,
|
||||
"sha256": "a5bf3a6cc836c5da0471d9a70d2eb9e81a5166c63bbfae993a910ba859936c9c",
|
||||
"verifiedDownload": true,
|
||||
"draftVerification": "Authenticated browser download; full byte count and SHA-256 matched before publication",
|
||||
"publishedVerification": "Published attachment full download byte count and SHA-256 matched"
|
||||
}
|
||||
],
|
||||
"passResult": true,
|
||||
"verification": "Both draft assets downloaded through authenticated browser and verified before publishing; both published assets downloaded and verified again; metadata read back.",
|
||||
"assetID": 45,
|
||||
"assetName": "大鱼调色-1.18.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/attachments/22e5cbb9-e51d-4808-b696-dc840c546fc2",
|
||||
"bytes": 46620783,
|
||||
"sha256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"draftVerification": "Authenticated browser download; full byte count and SHA-256 matched before publication",
|
||||
"publishedVerification": "Published attachment full download byte count and SHA-256 matched"
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"version": "1.18.0",
|
||||
"build": 105,
|
||||
"sourceCommit": "d0187695581fa3a8fe5c3cfa8a1bc6337425f5f6",
|
||||
"images": [
|
||||
{
|
||||
"symbol": "大鱼调色.app.dSYM",
|
||||
"uuid": "F952A83C-8229-3789-9945-3936C3C617B9",
|
||||
"binary": "大鱼调色.app/Contents/MacOS/大鱼调色"
|
||||
},
|
||||
{
|
||||
"symbol": "大鱼调色 XPC Service.pluginkit.dSYM",
|
||||
"uuid": "B5B02C34-12E6-3056-9337-6CFB0929804B",
|
||||
"binary": "大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
|
||||
}
|
||||
],
|
||||
"purpose": "Exact dSYM files for UUID/offset crash symbolication; no executable app or user reports.",
|
||||
"path": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.18.0-symbols.zip",
|
||||
"bytes": 3562272,
|
||||
"sha256": "a5bf3a6cc836c5da0471d9a70d2eb9e81a5166c63bbfae993a910ba859936c9c",
|
||||
"remoteStatus": "published and full download verified",
|
||||
"releaseID": 401,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.18.0-diagnostics-20261106",
|
||||
"assetID": 46,
|
||||
"downloadURL": "https://dayu.media/git/attachments/b6e5d7b6-1454-4295-8433-3ad407137458"
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"version": "1.18.1",
|
||||
"build": 106,
|
||||
"compiledSource": "1cc7f8edb2acb3cfc62bd72447c2956ad7a01601",
|
||||
"images": [
|
||||
{
|
||||
"name": "大鱼调色 XPC Service",
|
||||
"uuid": "78E7C898-7A75-3BBD-93CA-C7B3452BE1CC",
|
||||
"dSYM": "大鱼调色 XPC Service.pluginkit.dSYM"
|
||||
},
|
||||
{
|
||||
"name": "大鱼调色",
|
||||
"uuid": "F952A83C-8229-3789-9945-3936C3C617B9",
|
||||
"dSYM": "大鱼调色.app.dSYM"
|
||||
}
|
||||
],
|
||||
"path": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.18.1-symbols.zip",
|
||||
"bytes": 3595083,
|
||||
"sha256": "98959c848e4fec298b83ce69c703a8b571811e23a16d70a1b420d94bceb415f5",
|
||||
"installedBinaryUUIDMatch": true,
|
||||
"releaseUploaded": false
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
{
|
||||
"candidateVersion": "1.18.1",
|
||||
"build": 106,
|
||||
"sourceBaseline": "ca4abaf2c3dc67c482aaf7182668c3d6d7098268",
|
||||
"scope": "Local caller-decoded real 4K clip, 25fps, identical 285 frames and initial head ROI. Timed reset/track only; excludes decode, disk I/O, FxAnalyzer scheduling, preview and rendering. This is not end-to-end host speed.",
|
||||
"resolution": [
|
||||
3840,
|
||||
2160
|
||||
],
|
||||
"baseline": {
|
||||
"frames": 285,
|
||||
"milliseconds": 8776.568616
|
||||
},
|
||||
"candidate": {
|
||||
"frames": 285,
|
||||
"milliseconds": 1306.087993999999
|
||||
},
|
||||
"speedup": 6.7197376105732785,
|
||||
"maximumTrajectoryDifferences": {
|
||||
"cx": 0.0,
|
||||
"cy": 0.0,
|
||||
"scaleX": 0,
|
||||
"scaleY": 0,
|
||||
"rotation": 0
|
||||
},
|
||||
"opencvRegression": {
|
||||
"version": "4.5.1",
|
||||
"checks": [
|
||||
{
|
||||
"name": "pinned-public-opencv-version",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "300-feature-capacity",
|
||||
"pass": true,
|
||||
"error": 300
|
||||
},
|
||||
{
|
||||
"name": "translation-rotation-independent-xy-scale",
|
||||
"pass": true,
|
||||
"error": 0.00329193
|
||||
},
|
||||
{
|
||||
"name": "free-path-outside-creation-box-12-frame-subpixel",
|
||||
"pass": true,
|
||||
"error": 0.014753
|
||||
},
|
||||
{
|
||||
"name": "periodic-redetection-keeps-static-position",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "unrelated-cut-stops-with-last-trusted-position",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "flat-mask-rejected",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "moving-majority-prefers-subject-over-static-background",
|
||||
"pass": true,
|
||||
"error": 0.00237274
|
||||
},
|
||||
{
|
||||
"name": "independent-tracker-objects-do-not-share-motion",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "invalid-frame-preserves-authored-geometry",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "nonfinite-source-rejected",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
},
|
||||
{
|
||||
"name": "4k-complete-source-frame",
|
||||
"pass": true,
|
||||
"error": 0.000107325
|
||||
},
|
||||
{
|
||||
"name": "compact-gpu-byte-input-matches-quantized-float-and-flip",
|
||||
"pass": true,
|
||||
"error": 0
|
||||
}
|
||||
],
|
||||
"pass": true,
|
||||
"count": 13,
|
||||
"runtimeTargetAppUsed": false
|
||||
},
|
||||
"rejectedMetalLK": {
|
||||
"completedFrames": 132,
|
||||
"failureFrameIndex": 132,
|
||||
"reason": "Old Metal LK loses target during turn while OpenCV completes whole clip. Not enabled in production."
|
||||
},
|
||||
"productionChanges": [
|
||||
"Metal emits compact gray8 instead of float; readback 75% smaller",
|
||||
"Feature detection restricted to target bounds plus halo at full resolution",
|
||||
"OpenCV pyramids and derivatives reused across both directions and adjacent frames",
|
||||
"CPU OpenCV LK retained; no experimental optical-flow backend enabled"
|
||||
],
|
||||
"hostQA": "Formal notarized 1.18.1 completed two 285-frame FCP runs and workspace/parameter interactions; see HostTrackingUI1.18.1.json. Head drift persists; no accuracy improvement claim."
|
||||
}
|
||||
+11
-8
@@ -980,15 +980,20 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
@try {
|
||||
CMTime t=action.currentTime;
|
||||
id<FxParameterRetrievalAPI_v6> get=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
|
||||
_unified=DYUnifiedColorState(DYReadAssets(_embedded?[(DYToolManager*)_manager host]:_manager,t).colorManagement);
|
||||
id<PROAPIAccessing> maskHost=_embedded?[(DYToolManager*)_manager host]:_manager;
|
||||
DYAssetState *assets=DYReadAssets(_manager,t);
|
||||
NSDictionary *cms=_embedded?DYReadAssets(maskHost,t).colorManagement:assets.colorManagement;
|
||||
NSDictionary *tools=DYReadTools(maskHost,t).document;
|
||||
DYInspectorToken *oldToken=nil;[get getCustomParameterValue:&oldToken fromParameter:DYInspectorParameterID atTime:t];
|
||||
_unified=DYUnifiedColorState(cms);
|
||||
if(!_embedded&&!_workspaceEditor){
|
||||
[_renderOrder release];_renderOrder=[DYUnifiedRenderOrder(DYReadTools(_manager,t).document)copy];
|
||||
[_renderOrder release];_renderOrder=[DYUnifiedRenderOrder(tools)copy];
|
||||
NSMutableDictionary *primary=nil,*output=nil;for(NSMutableDictionary *card in _cards){if([card[@"section"][@"key"]isEqual:@"primary"])primary=card;if([card[@"section"][@"key"]isEqual:@"output"])output=card;}
|
||||
NSMutableArray *body=[NSMutableArray arrayWithArray:primary[@"body"]];
|
||||
for(NSView *row in output[@"body"]){if([row.identifier isEqual:@"toolMasks"])continue;[body removeObjectIdenticalTo:row];[(_unified?output:primary)[@"view"]addSubview:row];if(!_unified)[body addObject:row];}
|
||||
primary[@"body"]=body;
|
||||
}
|
||||
NSDictionary *initialTools=DYReadTools(_embedded?[(DYToolManager*)_manager host]:_manager,t).document;
|
||||
NSDictionary *initialTools=tools;
|
||||
for(NSMutableDictionary *card in _cards){NSString *type=card[@"section"][@"key"];card[@"removed"]=@([type isEqual:@"output"]?!_unified:!_embedded&&DYBaseToolRemoved(initialTools,type));}
|
||||
NSMutableDictionary *graphicValues=[NSMutableDictionary dictionary];
|
||||
for(NSNumber *pid in _controls) {
|
||||
@@ -1009,8 +1014,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
NSNumber *extra=c[@"section"][@"extraEnabled"];double extraValue=0;
|
||||
if(extra)[get getFloatValue:&extraValue fromParameter:extra.unsignedIntValue atTime:t];
|
||||
BOOL enabled=v>=.5||extraValue>=.5;
|
||||
DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:t];
|
||||
NSNumber *saved=[token isKindOfClass:DYInspectorToken.class]?token.folds[c[@"section"][@"key"]]:nil;
|
||||
NSNumber *saved=[oldToken isKindOfClass:DYInspectorToken.class]?oldToken.folds[c[@"section"][@"key"]]:nil;
|
||||
BOOL collapsed=_workspaceEditor?NO:saved?saved.boolValue:![self initiallyExpandedSection:c[@"section"][@"key"]];
|
||||
groupingChanged|=collapsed!=[c[@"collapsed"]boolValue];c[@"collapsed"]=@(collapsed);
|
||||
[c[@"header"]setState:collapsed?NSControlStateValueOff:NSControlStateValueOn];
|
||||
@@ -1021,7 +1025,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
[c[@"enabled"]setToolTip:enabled?@"停用本组,保留参数和展开状态":@"启用本组,保留展开状态"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];
|
||||
for(NSView *row in c[@"body"])row.alphaValue=enabled?1:.45;
|
||||
}
|
||||
id<PROAPIAccessing> maskHost=_embedded?[(DYToolManager*)_manager host]:_manager;NSDictionary *tools=DYReadTools(maskHost,t).document;for(NSDictionary *card in _cards){
|
||||
for(NSDictionary *card in _cards){
|
||||
NSString *type=card[@"section"][@"key"];
|
||||
BOOL removed=[type isEqual:@"output"]?!_unified:!_embedded&&DYBaseToolRemoved(tools,type);groupingChanged|=[card[@"removed"]boolValue]!=removed;((NSMutableDictionary *)card)[@"removed"]=@(removed);
|
||||
[card[@"maskPanel"]refreshWithDocument:tools time:t];
|
||||
@@ -1029,11 +1033,10 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
[(DYMaskCountBadge*)card[@"maskBadge"]setCount:count];NSString *hint=count?[NSString stringWithFormat:@"已有 %lu 个蒙版;点击添加独立蒙版",(unsigned long)count]:@"添加本工具的独立蒙版";
|
||||
[card[@"maskButton"]setToolTip:hint];[card[@"maskButton"]setAccessibilityHelp:hint];
|
||||
}
|
||||
DYAssetState *assets=DYReadAssets(_manager,t);NSDictionary *cms=_embedded?DYReadAssets([(DYToolManager*)_manager host],t).colorManagement:assets.colorManagement;_tabs[@"managedColor"]=@(cms.count>0&&!DYPrimaryColorState(cms));_tabs[@"primaryCMS"]=@(DYPrimaryColorState(cms));[_managedPanel refreshWithState:assets.colorManagement context:[_renderer colorContext]];[_managedPanel setInputLUTPath:assets.paths[@"input"]];for(NSDictionary *r in _controls.allValues)if([r[@"descriptor"][@"key"]isEqual:@"cmmix"])[r[@"label"]setStringValue:([_tabs[@"managedColor"]boolValue]||[_tabs[@"primaryCMS"]boolValue])?@"调色混合":@"CST 混合"];
|
||||
_tabs[@"managedColor"]=@(cms.count>0&&!DYPrimaryColorState(cms));_tabs[@"primaryCMS"]=@(DYPrimaryColorState(cms));[_managedPanel refreshWithState:assets.colorManagement context:[_renderer colorContext]];[_managedPanel setInputLUTPath:assets.paths[@"input"]];for(NSDictionary *r in _controls.allValues)if([r[@"descriptor"][@"key"]isEqual:@"cmmix"])[r[@"label"]setStringValue:([_tabs[@"managedColor"]boolValue]||[_tabs[@"primaryCMS"]boolValue])?@"调色混合":@"CST 混合"];
|
||||
for(NSDictionary *c in _cards)if([c[@"section"][@"key"]isEqual:@"primary"]){[c[@"enabled"]setToolTip:([_tabs[@"managedColor"]boolValue]||_unified)?@"启停此层一级调色;全局色彩管理保持当前方式":@"启停此层输入、一级调色与输出转换"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];}
|
||||
[_spiderPanel setMesh:assets.spiderMesh linked:assets.spiderLinked];
|
||||
double profile=0,configured=0;[get getFloatValue:&profile fromParameter:2013 atTime:t];[get getFloatValue:&configured fromParameter:2236 atTime:t];
|
||||
DYInspectorToken *oldToken=nil;[get getCustomParameterValue:&oldToken fromParameter:DYInspectorParameterID atTime:t];
|
||||
_tabs[@"legacyInput"]=@(configured<.5&&(configured<0||profile>.5||[assets.paths[@"input"]length]||oldToken.schema<2));
|
||||
for(NSString *key in _assetButtons) {
|
||||
NSString *path=assets.paths[key]; NSButton *button=_assetButtons[key][@"choose"];
|
||||
|
||||
+3
-1
@@ -41,12 +41,14 @@
|
||||
// remote parameter read and view rebuild for every scalar in the burst.
|
||||
if(!_modelRefreshPending.exchange(true)){id host=_apiManager;dispatch_async(dispatch_get_main_queue(),^{self->_modelRefreshPending.store(false);[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];});}return YES;}
|
||||
- (BOOL)pluginState:(NSData**)state atTime:(CMTime)t quality:(FxQuality)q error:(NSError**)e{
|
||||
uint64_t stateSpan=DYBetaSpanBegin(@"plugin_state",nil);@try{
|
||||
DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];[_viewerParameterBridge publishAssets:a atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:©Auto fromParameter:8800 atTime:t];NSDictionary *snapshot=DYToolRenderSnapshot(tools.document,t);for(NSMutableDictionary *node in snapshot[@"layers"])if([node[@"type"]isEqual:@"film"]){DYUniforms layer=DYToolUniforms(node);node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;id<FxColorGamutAPI_v2>gamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil;
|
||||
}@finally{DYBetaSpanEnd(stateSpan,nil);}
|
||||
}
|
||||
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;}
|
||||
- (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray<FxImageTile*>*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;}
|
||||
- (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray<FxImageTile*>*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];@synchronized(self){
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t renderSpan=DYBetaSpanBegin(@"render",@{@"width":@(src[0].ioSurface.width),@"height":@(src[0].ioSurface.height),@"layer_count":@([p[@"tools"][@"layers"]count])});uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=NO;@try{ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];}@finally{DYBetaSpanEnd(renderSpan,@{@"status":ok?@"passed":@"failed"});}DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",DYBetaErrorFields((e&&*e)?*e:nil,@"render_source"));if(ok){[_renderer captureScopeTile:dst atTime:t];@synchronized(self){
|
||||
FxRect image=src[0].imagePixelBounds;
|
||||
double aspect=src[0].pixelAspect,height=image.top-image.bottom,width=image.right-image.left;
|
||||
_toolSourceAspect=width>0&&height>0&&std::isfinite(aspect)&&aspect>0?width*aspect/height:0;
|
||||
|
||||
@@ -9,6 +9,19 @@
|
||||
DYToolManager *one=[[[DYToolManager alloc]initWithHost:manager node:first]autorelease];DYWriteTools(manager,doc,kCMTimeZero);id<FxCustomParameterActionAPI_v4>action=(id)one;[action startAction:one];
|
||||
[(id<FxParameterSettingAPI_v6>)one setFloatValue:17 toParameter:2068 atTime:kCMTimeZero];[(id<FxParameterSettingAPI_v6>)one setFloatValue:26 toParameter:2076 atTime:kCMTimeZero];[action endAction:one];NSDictionary *written=DYReadTools(manager,kCMTimeZero).document;
|
||||
run.record(@"instance-proxy-batches-multiple-fields-without-clobber",[DYToolWithID(written,first[@"id"])[@"values"][@"hsl0_0"]isEqual:@17]&&[DYToolWithID(written,first[@"id"])[@"values"][@"hsl1_0"]isEqual:@26]&&[DYToolWithID(written,second[@"id"])[@"values"][@"hsl1_2"]isEqual:@55]);
|
||||
// A cached action must see writes immediately, and a later action must see
|
||||
// host-side undo/external edits. Exercise both the numeric snapshot and scope.
|
||||
[action startAction:one];double before=0,after=0;
|
||||
[(id<FxParameterRetrievalAPI_v6>)one getFloatValue:&before fromParameter:2068 atTime:kCMTimeZero];
|
||||
[(id<FxParameterSettingAPI_v6>)one setFloatValue:19 toParameter:2068 atTime:kCMTimeZero];
|
||||
[(id<FxParameterRetrievalAPI_v6>)one getFloatValue:&after fromParameter:2068 atTime:kCMTimeZero];
|
||||
[action endAction:one];run.record(@"layer-snapshot-read-after-write-in-one-action",before==17&&after==19);
|
||||
NSMutableDictionary *external=DYMutablePlist(DYReadTools(manager,kCMTimeZero).document);
|
||||
((NSMutableDictionary*)DYToolWithID(external,first[@"id"]))[@"values"][@"hsl0_0"]=@23;
|
||||
DYWriteTools(manager,external,kCMTimeZero);[action startAction:one];
|
||||
[(id<FxParameterRetrievalAPI_v6>)one getFloatValue:&after fromParameter:2068 atTime:kCMTimeZero];[action endAction:one];
|
||||
run.record(@"layer-snapshot-next-action-sees-external-edit",after==23);
|
||||
DYWriteTools(manager,written,kCMTimeZero);
|
||||
DYInspector *stackInspector=[[[DYInspector alloc]initWithAPIManager:manager renderer:renderer]autorelease];[stackInspector refresh];[stackInspector setFrameSize:NSMakeSize(360,780)];[stackInspector layoutSubtreeIfNeeded];NSDictionary *stackViews=[stackInspector valueForKey:@"_stackViews"];BOOL nativeViews=stackViews.count==2;for(NSString *ID in stackViews){NSArray *c=[stackViews[ID]valueForKey:@"_cards"];nativeViews&=c.count==1&&c[0][@"maskButton"]&&c[0][@"repeatButton"]&&[c[0][@"section"][@"key"]isEqual:@"hsl"];}run.record(@"two-native-hsl-panels-with-mask-and-repeat-buttons",nativeViews);
|
||||
NSMutableDictionary *invalid=DYMutablePlist(doc);invalid[@"layers"][1][@"id"]=first[@"id"];run.record(@"tool-document-rejects-duplicate-identity",!DYValidToolDocument(invalid));invalid=DYMutablePlist(doc);invalid[@"layers"][0][@"values"][@"hsl0_0"]=@(NAN);run.record(@"tool-document-rejects-nonfinite",!DYValidToolDocument(invalid));
|
||||
NSMutableDictionary *mask=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters p=DYMaskAtTime(mask,kCMTimeZero);p.feather=0;p.width=.5;p.height=.5;mask[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];CMTime a=CMTimeMake(1001,24000),b=CMTimeMake(2002,24000);DYMaskParameters moved=p;moved.centerX=.7;moved.width=.6;moved.angle=.2;mask[@"keys"]=@[DYMaskKey(a,p,YES,1),DYMaskKey(b,moved,NO,.9)];
|
||||
|
||||
@@ -31,6 +31,7 @@ public:
|
||||
~MetalFlow(){for(int i=0;i<2;i++)[frames_[i] release];[points_ release];[results_ release];[pyramid_ release];[flow_ release];[queue_ release];[device_ release];}
|
||||
bool ready()const{return device_&&queue_&&pyramid_&&flow_&&flow_.threadExecutionWidth==32;}
|
||||
bool reset(const dy::GrayFrame& f) override {
|
||||
if(f.valid()&&f.pixels.empty())return reset(f.expanded());
|
||||
if(!ready()||!f.valid())return false;
|
||||
info_={};info_.levels=1;info_.width[0]=f.width;info_.height[0]=f.height;
|
||||
int total=f.width*f.height;
|
||||
@@ -47,6 +48,7 @@ public:
|
||||
id<MTLCommandBuffer>b=[queue_ commandBuffer];pyramid(b,frames_[0]);return finish(b);
|
||||
}
|
||||
bool advance(const dy::GrayFrame& f,const std::vector<dy::FlowPoint>& points,std::vector<dy::FlowMatch>& matches) override {
|
||||
if(f.valid()&&f.pixels.empty())return advance(f.expanded(),points,matches);
|
||||
if(!f.valid()||f.width!=info_.width[0]||f.height!=info_.height[0]||points.empty()||points.size()>dy::TrackerFeatureLimit)return false;
|
||||
int next=1-previous_;memcpy(frames_[next].contents,f.pixels.data(),f.pixels.size()*sizeof(float));
|
||||
memcpy(points_.contents,points.data(),points.size()*sizeof(dy::FlowPoint));
|
||||
|
||||
@@ -2,7 +2,11 @@
|
||||
// CF asks the host for video gamma 2.2, then Lanczos-scales to RGBA8 before
|
||||
// OpenCV gray conversion. Adapt our linear host contract in a separate texture.
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error {
|
||||
return [self toolGrayFrame:tile preview:nil error:error];
|
||||
auto result=[self toolGrayFrame:tile preview:nil error:error];
|
||||
// The diagnostic/legacy caller expects normalized floats. Actual analysis
|
||||
// keeps the GPU-produced bytes through OpenCV, without float expansion.
|
||||
if(result.valid()&&result.pixels.empty()){result.pixels.resize(result.bytes.size());for(size_t i=0;i<result.bytes.size();++i)result.pixels[i]=result.bytes[i]/255.f;result.bytes.clear();}
|
||||
return result;
|
||||
}
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile preview:(NSDictionary**)preview error:(NSError**)error {
|
||||
@synchronized(_toolCaptureDevices){
|
||||
@@ -27,7 +31,7 @@
|
||||
id<MTLTexture>encoded=entry[@"encoded"],bytes=entry[@"bytes"];
|
||||
if(!encoded||encoded.width!=source.width||encoded.height!=source.height||encoded.pixelFormat!=format){MTLTextureDescriptor*d=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:format width:source.width height:source.height mipmapped:NO];d.storageMode=MTLStorageModePrivate;d.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;encoded=[[device newTextureWithDescriptor:d]autorelease];if(!encoded)return {};entry[@"encoded"]=encoded;}
|
||||
if(!bytes||bytes.width!=width||bytes.height!=height){MTLTextureDescriptor*d=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA8Unorm width:width height:height mipmapped:NO];d.storageMode=MTLStorageModePrivate;d.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;bytes=[[device newTextureWithDescriptor:d]autorelease];if(!bytes)return {};entry[@"bytes"]=bytes;}
|
||||
id<MTLBuffer>buffer=entry[@"buffer"];if(!buffer||buffer.length!=width*height*sizeof(float)){buffer=[[device newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared]autorelease];if(!buffer)return {};entry[@"buffer"]=buffer;}
|
||||
id<MTLBuffer>buffer=entry[@"buffer"];if(!buffer||buffer.length!=width*height){buffer=[[device newBufferWithLength:width*height options:MTLResourceStorageModeShared]autorelease];if(!buffer)return {};entry[@"buffer"]=buffer;}
|
||||
id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gamma"]];[encoder setTexture:source atIndex:0];[encoder setTexture:encoded atIndex:1];[encoder dispatchThreads:MTLSizeMake(source.width,source.height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
|
||||
[entry[@"scale"]encodeToCommandBuffer:commands sourceTexture:encoded destinationTexture:bytes];
|
||||
vector_uint3 info={(unsigned)width,(unsigned)height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gray"]];[encoder setTexture:bytes atIndex:0];[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&info length:sizeof(info)atIndex:1];[encoder dispatchThreads:MTLSizeMake(width,height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
|
||||
@@ -58,6 +62,6 @@
|
||||
*preview=@{@"rgba":[NSData dataWithBytes:previewBuffer.contents length:previewBuffer.length],
|
||||
@"width":@(previewInfo.x),@"height":@(previewInfo.y),@"aspect":@(aspect)};
|
||||
}
|
||||
dy::GrayFrame result{int(width),int(height),std::vector<float>(width*height)};memcpy(result.pixels.data(),buffer.contents,width*height*sizeof(float));return result;
|
||||
dy::GrayFrame result;result.width=int(width);result.height=int(height);const auto*begin=static_cast<const uint8_t*>(buffer.contents);result.bytes.assign(begin,begin+width*height);return result;
|
||||
}
|
||||
}
|
||||
@@ -232,14 +232,14 @@
|
||||
return [self finishToolAnalysis:[NSString stringWithFormat:@"%@,已保留 %lu 帧可信轨迹;可调整区域后从此处继续",detail,(unsigned long)_trackingSamples.count] error:error];
|
||||
}
|
||||
- (BOOL)analyzeFrame:(FxImageTile*)tile atTime:(CMTime)time error:(NSError**)error {
|
||||
if(!_trackingActive.load()||_trackingFinishing.load()){if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:nil];return NO;}_trackingInFrame.store(true);@try{
|
||||
if(!_trackingActive.load()||_trackingFinishing.load()){if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:nil];return NO;}_trackingInFrame.store(true);uint64_t trackingSpan=DYBetaSpanBegin(@"tracking_frame",nil);@try{
|
||||
if(_trackingCancelled.load())return [self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:error];if(_trackingSingle&&_trackingSamples.count>=2)return [self finishToolAnalysis:nil error:error];if(_trackingSamples.count>=DYToolKeyLimit)return [self finishToolAnalysis:@"轨迹已到数量上限,保留已完成部分" error:error];
|
||||
CMTime expected=CMTIME_IS_NUMERIC(_trackingPreviousTime)?(_trackingBackward?CMTimeSubtract(_trackingPreviousTime,_trackingFrameDuration):CMTimeAdd(_trackingPreviousTime,_trackingFrameDuration)):_trackingReferenceTime;if(!CMTIME_IS_NUMERIC(time)||time.epoch!=expected.epoch||CMTimeCompare(time,expected)!=0)return [self stopToolAnalysis:@"宿主帧序列不连续,停在最后可信帧" error:error];
|
||||
NSDictionary *preview=nil;
|
||||
dy::GrayFrame frame=[self toolGrayFrame:tile preview:_trackingSingle?nullptr:&preview error:error];
|
||||
if(!frame.valid())return [self stopToolAnalysis:@"宿主未返回完整源画面" error:error];
|
||||
if(!_trackingSamples.count){if(_trackingReferenceFrame.valid()&&frame.width==_trackingReferenceFrame.width&&frame.height==_trackingReferenceFrame.height){double same=0,flip=0;size_t count=0;for(int y=0;y<frame.height;y+=8)for(int x=0;x<frame.width;x+=8){float p=frame.pixels[y*frame.width+x];same+=fabs(p-_trackingReferenceFrame.pixels[y*frame.width+x]);flip+=fabs(p-_trackingReferenceFrame.pixels[(frame.height-1-y)*frame.width+x]);count++;}same/=MAX(size_t(1),count);flip/=MAX(size_t(1),count);_trackingFlip=flip<.035&&flip+.008<same&&flip<same*.8;}os_log(OS_LOG_DEFAULT,"dayu_tool_track_seed width=%{public}d height=%{public}d flip=%{public}d time=%{public}.6f",frame.width,frame.height,(int)_trackingFlip,CMTimeGetSeconds(time));}
|
||||
if(_trackingFlip)for(int y=0;y<frame.height/2;y++)for(int x=0;x<frame.width;x++)std::swap(frame.pixels[y*frame.width+x],frame.pixels[(frame.height-1-y)*frame.width+x]);
|
||||
if(!_trackingSamples.count){if(_trackingReferenceFrame.valid()&&frame.width==_trackingReferenceFrame.width&&frame.height==_trackingReferenceFrame.height){double same=0,flip=0;size_t count=0;for(int y=0;y<frame.height;y+=8)for(int x=0;x<frame.width;x+=8){float p=frame.at(y*frame.width+x);same+=fabs(p-_trackingReferenceFrame.at(y*frame.width+x));flip+=fabs(p-_trackingReferenceFrame.at((frame.height-1-y)*frame.width+x));count++;}same/=MAX(size_t(1),count);flip/=MAX(size_t(1),count);_trackingFlip=flip<.035&&flip+.008<same&&flip<same*.8;}os_log(OS_LOG_DEFAULT,"dayu_tool_track_seed width=%{public}d height=%{public}d flip=%{public}d time=%{public}.6f",frame.width,frame.height,(int)_trackingFlip,CMTimeGetSeconds(time));}
|
||||
if(_trackingFlip)frame.flipVertically();
|
||||
BOOL stamp=_trackingStampMotion.active;
|
||||
dy::TrackResult target,source;
|
||||
if(!_trackingSamples.count){
|
||||
@@ -302,7 +302,7 @@
|
||||
if(stamp)os_log(OS_LOG_DEFAULT,"dayu_stamp_track_pair time=%{public}.6f target=%{public}.5f,%{public}.5f source=%{public}.5f,%{public}.5f target_scale=%{public}.4f,%{public}.4f source_scale=%{public}.4f,%{public}.4f",CMTimeGetSeconds(time),target.cx,target.cy,source.cx,source.cy,motion.targetScaleX,motion.targetScaleY,motion.sourceScaleX,motion.sourceScaleY);
|
||||
}
|
||||
return YES;
|
||||
}@finally{_trackingInFrame.store(false);}
|
||||
}@finally{DYBetaSpanEnd(trackingSpan,nil);_trackingInFrame.store(false);}
|
||||
}
|
||||
- (BOOL)cleanupAnalysis:(NSError**)error {
|
||||
if(!_trackingActive.load()||_trackingFinishing.exchange(true))return YES;BOOL changed=_trackingSamples.count>1;if(changed&&!DYMergeTracking(_trackingCandidate,_trackingSamples,_trackingFrameDuration)){[_trackingMessage release];_trackingMessage=[@"轨迹合并失败,原蒙版已保留" copy];_trackingDiscard=YES;}
|
||||
|
||||
+10
-4
@@ -395,12 +395,13 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms
|
||||
|
||||
@implementation DYToolManager {
|
||||
id<PROAPIAccessing> _host;NSString *_nodeID,*_type;NSInteger _depth;CMTime _time;NSMutableDictionary *_pending;DYInspectorToken *_token;
|
||||
DYUniforms _readUniforms;BOOL _readUniformsValid;
|
||||
}
|
||||
@synthesize host=_host,nodeID=_nodeID,type=_type;
|
||||
- (instancetype)initWithHost:(id<PROAPIAccessing>)h node:(NSDictionary*)n{if((self=[super init])){_host=h;_nodeID=[n[@"id"]copy];_type=[n[@"type"]copy];}return self;}
|
||||
- (void)dealloc{[_nodeID release];[_type release];[_pending release];[_token release];[super dealloc];}
|
||||
- (id)apiForProtocol:(Protocol*)p{if(protocol_isEqual(p,@protocol(FxParameterRetrievalAPI_v6))||protocol_isEqual(p,@protocol(FxParameterSettingAPI_v6))||protocol_isEqual(p,@protocol(FxCustomParameterActionAPI_v4)))return self;return [_host apiForProtocol:p];}
|
||||
- (void)startAction:(id)sender{if(_depth++==0){[[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]startAction:sender];_time=[(id<FxCustomParameterActionAPI_v4>)[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]currentTime];[_pending release];_pending=[DYMutablePlist(DYReadTools(_host,_time).document)retain];}}
|
||||
- (void)startAction:(id)sender{if(_depth++==0){_readUniformsValid=NO;[[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]startAction:sender];_time=[(id<FxCustomParameterActionAPI_v4>)[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]currentTime];[_pending release];_pending=[DYMutablePlist(DYReadTools(_host,_time).document)retain];}}
|
||||
- (void)endAction:(id)sender{
|
||||
if(_depth<=0||--_depth>0)return;
|
||||
@try{
|
||||
@@ -415,9 +416,14 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms
|
||||
}
|
||||
}
|
||||
- (CMTime)currentTime{return _time;}
|
||||
- (NSDictionary*)node{return DYToolWithID(_pending?:DYReadTools(_host,_time).document,_nodeID);}
|
||||
- (BOOL)getFloatValue:(double*)out fromParameter:(UInt32)pid atTime:(CMTime)t{NSDictionary *n=[self node];DYUniforms u=DYToolUniforms(n?:@{@"type":_type});for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){*out=[d[@"offset"]integerValue]>=0?*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue]):[d[@"default"]doubleValue];return YES;}return NO;}
|
||||
- (BOOL)setFloatValue:(double)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth||!std::isfinite(v))return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){NSString *key=d[@"key"];if(n[@"primaryFollow"]&&([key hasSuffix:@"Transfer"]||[key hasSuffix:@"Gamut"])){NSUInteger bit=[key hasPrefix:@"cminput"]?1:[key hasPrefix:@"cmworking"]?2:[key hasPrefix:@"cmoutput"]?4:0;n[@"primaryFollow"]=@([n[@"primaryFollow"]unsignedIntegerValue]&~bit);}n[@"values"][key]=@(v);return YES;}return NO;}
|
||||
- (NSDictionary*)node{return DYToolWithID(_depth?_pending:DYReadTools(_host,_time).document,_nodeID);}
|
||||
- (BOOL)getFloatValue:(double*)out fromParameter:(UInt32)pid atTime:(CMTime)t{
|
||||
// One coherent snapshot per action, invalidated by any authoring write.
|
||||
// Inspector controls previously rebuilt every section for every scalar.
|
||||
if(!_depth||!_readUniformsValid){_readUniforms=DYToolUniforms([self node]?:@{@"type":_type});_readUniformsValid=_depth>0;}
|
||||
for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){if(out)*out=[d[@"offset"]integerValue]>=0?*(float*)((uint8_t*)&_readUniforms+[d[@"offset"]unsignedIntegerValue]):[d[@"default"]doubleValue];return YES;}return NO;
|
||||
}
|
||||
- (BOOL)setFloatValue:(double)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth||!std::isfinite(v))return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){NSString *key=d[@"key"];if(n[@"primaryFollow"]&&([key hasSuffix:@"Transfer"]||[key hasSuffix:@"Gamut"])){NSUInteger bit=[key hasPrefix:@"cminput"]?1:[key hasPrefix:@"cmworking"]?2:[key hasPrefix:@"cmoutput"]?4:0;n[@"primaryFollow"]=@([n[@"primaryFollow"]unsignedIntegerValue]&~bit);}n[@"values"][key]=@(v);_readUniformsValid=NO;return YES;}return NO;}
|
||||
- (BOOL)getCustomParameterValue:(id*)out fromParameter:(UInt32)pid atTime:(CMTime)t{if(pid==DYAssetsParameterID){DYAssetState *a=[[[DYAssetState alloc]init]autorelease];NSDictionary *n=[self node];a.paths=n[@"paths"]?:@{};a.spiderMesh=n[@"spider"];a.spiderLinked=[n[@"spiderLinked"]boolValue];*out=a;return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *global=_token; if(!global)[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&global fromParameter:pid atTime:t];DYInspectorToken *local=[[[DYInspectorToken alloc]init]autorelease];NSMutableDictionary *folds=[NSMutableDictionary dictionary];for(NSString *key in global.folds)if([key hasPrefix:[_nodeID stringByAppendingString:@":"]])folds[[key substringFromIndex:_nodeID.length+1]]=global.folds[key];local.folds=folds;*out=local;return YES;}return NO;}
|
||||
- (BOOL)setCustomParameterValue:(id)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth)return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;if(pid==DYAssetsParameterID&&[v isKindOfClass:DYAssetState.class]){n[@"paths"]=DYMutablePlist([v paths]);if([v spiderMesh])n[@"spider"]=[v spiderMesh];else[n removeObjectForKey:@"spider"];n[@"spiderLinked"]=@([v spiderLinked]);return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *old=nil;[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:pid atTime:t];[_token release];_token=old?[old copy]:[DYInspectorToken new];NSMutableDictionary *folds=[[_token.folds mutableCopy]autorelease];for(NSString *key in [v folds])folds[[_nodeID stringByAppendingFormat:@":%@",key]]=[v folds][key];_token.folds=folds;return YES;}return NO;}
|
||||
@end
|
||||
@@ -63,6 +63,9 @@
|
||||
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){float encoded=x%3==1?.8f:.2f,linear=powf((encoded+.055f)/1.055f,2.4f);auto i=(y*w+x)*4;pixels[i]=pixels[i+1]=pixels[i+2]=linear;pixels[i+3]=1;}
|
||||
[[fine metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:w*8];auto gray=[plugin toolGrayFrame:fine error:nil];double maximum=0;for(NSUInteger y=0;y<(NSUInteger)gray.height;y++)for(NSUInteger x=0;x<(NSUInteger)gray.width;x++){double code=x%3==1?.8:.2;double expected=std::round(std::pow(std::pow((code+.055)/1.055,2.4),1/2.2)*255)/255.;maximum=std::max(maximum,fabs(double(gray.pixels[y*gray.width+x])-expected));}
|
||||
run.record(@"tracking-4k-frame-preserves-full-detail-for-opencv",gray.valid()&&gray.width==3840&&gray.height==2160&&maximum<.002,@{@"width":@(gray.width),@"height":@(gray.height),@"maximumError":@(maximum)});
|
||||
auto compact=[plugin toolGrayFrame:fine preview:nullptr error:nil];BOOL identical=compact.valid()&&compact.pixels.empty()&&compact.bytes.size()==w*h;
|
||||
for(size_t i=0;i<compact.bytes.size()&&identical;++i)identical=compact.at(i)==gray.pixels[i];
|
||||
run.record(@"tracking-metal-gray8-compact-readback-matches-float-reference",identical,@{@"readbackBytes":@(compact.bytes.size()),@"previousReadbackBytes":@(gray.pixels.size()*sizeof(float))});
|
||||
}
|
||||
// UI aliases of a shared object are one tracking target. Switching from the
|
||||
// global editor to either linked module must not cancel a valid analysis.
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
- (BOOL)analyzeFrame:(FxImageTile*)frame atTime:(CMTime)time error:(NSError**)error;
|
||||
- (BOOL)cleanupAnalysis:(NSError**)error;
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error;
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile preview:(NSDictionary**)preview error:(NSError**)error;
|
||||
@end
|
||||
|
||||
@interface DYToolCanvasProbe : DYToolTrackingProbe
|
||||
|
||||
@@ -54,9 +54,9 @@ kernel void dyToolEncodeGamma22(texture2d<float,access::read> source [[texture(0
|
||||
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;float4 pixel=source.read(pos);float alpha=max(pixel.a,0.f);float3 straight=alpha>0?pixel.rgb/alpha:float3(0);output.write(float4(pow(max(straight,float3(0)),float3(1.f/2.2f))*alpha,alpha),pos);
|
||||
}
|
||||
// Lanczos RGBA8 -> top-first OpenCV Gray8. Analysis never changes color output.
|
||||
kernel void dyToolCapture(texture2d<float> source [[texture(0)]],device float* pixels [[buffer(0)]],constant uint3& info [[buffer(1)]],uint2 pos [[thread_position_in_grid]]){
|
||||
kernel void dyToolCapture(texture2d<float> source [[texture(0)]],device uchar* pixels [[buffer(0)]],constant uint3& info [[buffer(1)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=info.x||pos.y>=info.y)return;uint2 point=uint2(pos.x,info.z?info.y-1-pos.y:pos.y);uint3 rgb=uint3(rint(source.read(point).rgb*255.f));
|
||||
pixels[pos.y*info.x+pos.x]=float((rgb.r*9798u+rgb.g*19235u+rgb.b*3735u+16384u)>>15)/255.f;
|
||||
pixels[pos.y*info.x+pos.x]=uchar((rgb.r*9798u+rgb.g*19235u+rgb.b*3735u+16384u)>>15);
|
||||
}
|
||||
|
||||
// Reuse the analysis source texture for the lightweight color preview.
|
||||
|
||||
@@ -65,7 +65,10 @@
|
||||
}
|
||||
for(NSDictionary*mask in DYSharedMasks(document))if(!DYToolIDsForSharedMask(document,mask[@"id"]).count){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":mask[@"stampSource"]?@"◩ 仿制图章":[@"◩ " stringByAppendingString:mask[@"label"]?:[@"未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]]],@"kind":@"mask"}];}
|
||||
}@finally{[action endAction:self];}
|
||||
[_toolDocument release];_toolDocument=document;[_layerRows release];_layerRows=[rows copy];[_layerTable reloadData];
|
||||
[_toolDocument release];_toolDocument=document;
|
||||
// A scalar drag changes the editor, not the layer list. Retain row views and
|
||||
// selection while their actual displayed model is unchanged.
|
||||
if(![_layerRows isEqual:rows]){[_layerRows release];_layerRows=[rows copy];[_layerTable reloadData];}
|
||||
NSString *requested=note.userInfo[@"scrollToTool"];if(requested.length){_hasUserSelection=YES;[_selectedNode release];_selectedNode=[requested copy];[_selectedMask release];_selectedMask=nil;}
|
||||
NSInteger selected=-1;for(NSUInteger i=0;i<_layerRows.count;i++){NSDictionary*row=_layerRows[i];if([row[@"node"]isEqual:_selectedNode]&&(_selectedMask?[row[@"mask"]isEqual:_selectedMask]:!row[@"mask"])){selected=i;break;}}
|
||||
if(selected<0&&_selectedMask)for(NSUInteger i=0;i<_layerRows.count;i++)if([_layerRows[i][@"mask"]isEqual:_selectedMask]){selected=i;[_selectedNode release];_selectedNode=[_layerRows[i][@"node"]copy];break;}
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.17.1</string>
|
||||
<string>1.18.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>103</string>
|
||||
<string>106</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
@@ -71,7 +71,7 @@
|
||||
<key>uuid</key>
|
||||
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
|
||||
<key>version</key>
|
||||
<string>1.17.1</string>
|
||||
<string>1.18.1</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
@@ -13,6 +13,9 @@ public:
|
||||
OpenCVTracker(const OpenCVTracker&) = delete;
|
||||
OpenCVTracker& operator=(const OpenCVTracker&) = delete;
|
||||
void setMask(std::vector<FlowPoint>);
|
||||
// Optional GPU optical flow; feature selection and robust fitting stay in
|
||||
// the pinned OpenCV implementation. A backend failure stops this run.
|
||||
void setFlowBackend(std::shared_ptr<FlowBackend>);
|
||||
bool reset(const GrayFrame&, TrackerROI);
|
||||
TrackResult track(const GrayFrame&);
|
||||
TrackResult result() const;
|
||||
|
||||
@@ -23,9 +23,24 @@ constexpr float TrackerFitTolerance = 3.f;
|
||||
struct GrayFrame {
|
||||
int width = 0, height = 0;
|
||||
std::vector<float> pixels;
|
||||
// Compact GPU analysis input. Legacy/synthetic callers keep using floats.
|
||||
std::vector<uint8_t> bytes;
|
||||
bool valid() const {
|
||||
return width >= 16 && height >= 16 &&
|
||||
pixels.size() == static_cast<size_t>(width) * height;
|
||||
(pixels.size() == static_cast<size_t>(width) * height ||
|
||||
(pixels.empty() && bytes.size() == static_cast<size_t>(width) * height));
|
||||
}
|
||||
float at(size_t i) const {return pixels.empty()?bytes[i]/255.f:pixels[i];}
|
||||
GrayFrame expanded() const {
|
||||
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;
|
||||
}
|
||||
void flipVertically() {
|
||||
for(int y=0;y<height/2;++y)for(int x=0;x<width;++x){
|
||||
size_t a=size_t(y)*width+x,b=size_t(height-1-y)*width+x;
|
||||
if(pixels.empty())std::swap(bytes[a],bytes[b]);else std::swap(pixels[a],pixels[b]);
|
||||
}
|
||||
}
|
||||
static GrayFrame fromRGBA8(const uint8_t* data, int w, int h, size_t stride) {
|
||||
if (!data || w <= 0 || h <= 0 || stride < static_cast<size_t>(w) * 4) return {};
|
||||
@@ -347,6 +362,7 @@ public:
|
||||
void setBackend(std::shared_ptr<FlowBackend> b) {backend_=std::move(b);active_=false;}
|
||||
void setMask(std::vector<P> p) {mask_=std::move(p);}
|
||||
bool reset(const GrayFrame& frame,TrackerROI roi) {
|
||||
if(frame.valid()&&frame.pixels.empty())return reset(frame.expanded(),roi);
|
||||
active_=false;points_.clear();previous_.clear();cumulative_={};frameIndex_=0;
|
||||
result_={roi.cx,roi.cy,1,0,0,0,0,false};
|
||||
if (!frame.valid() || !std::isfinite(roi.cx) || !std::isfinite(roi.cy) ||
|
||||
@@ -361,6 +377,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
TrackResult track(const GrayFrame& frame) {
|
||||
if(frame.valid()&&frame.pixels.empty())return track(frame.expanded());
|
||||
if (!active_ || !frame.valid() || frame.width!=width_ || frame.height!=height_) {
|
||||
result_.valid=false;result_.confidence=0;result_.failure=TrackFailure::InvalidFrame;active_=false;return result_;
|
||||
}
|
||||
|
||||
@@ -13,3 +13,7 @@ FOUNDATION_EXPORT void DYBetaSetEnabled(BOOL enabled);
|
||||
FOUNDATION_EXPORT NSDictionary *DYBetaStatus(void);
|
||||
FOUNDATION_EXPORT void DYBetaSendSummary(void);
|
||||
FOUNDATION_EXPORT BOOL DYBetaAllowedURL(NSURL *url, BOOL download);
|
||||
// Pure evidence parsing also used by offline regression checks; never transmits input.
|
||||
FOUNDATION_EXPORT NSDictionary *DYBetaCrashEvidence(NSDictionary *header, NSDictionary *body);
|
||||
FOUNDATION_EXPORT NSString *DYBetaSampleFrames(NSString *sample);
|
||||
FOUNDATION_EXPORT NSDictionary *DYBetaErrorFields(NSError *error, NSString *stage);
|
||||
+136
-45
@@ -7,6 +7,8 @@
|
||||
#include <signal.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <libproc.h>
|
||||
#include <sys/resource.h>
|
||||
|
||||
NSString *const DYBetaDiagnosticsChanged = @"DYBetaDiagnosticsChanged";
|
||||
static NSString *const DYBetaPreferenceDomain = @"com.dayu.color.preferences";
|
||||
@@ -14,7 +16,8 @@ static std::atomic_bool gEnabled(true);
|
||||
static std::atomic_uint_fast64_t gSpan(0);
|
||||
static std::atomic<double> gMainReply(0);
|
||||
static NSObject *gSpanLock, *gStatusLock;
|
||||
static NSMutableDictionary *gActive;
|
||||
static NSMutableDictionary *gActive, *gMetrics;
|
||||
static void mainPulse(CFRunLoopTimerRef timer,void *context){gMainReply.store(NSProcessInfo.processInfo.systemUptime);}
|
||||
static NSDictionary *gStatus;
|
||||
static BOOL gProduct;
|
||||
|
||||
@@ -26,7 +29,7 @@ BOOL DYBetaAllowedURL(NSURL *url, BOOL download) {
|
||||
}
|
||||
NSDictionary *DYBetaSafeFields(NSDictionary *fields) {
|
||||
static NSSet *allowed; static dispatch_once_t once;
|
||||
dispatch_once(&once,^{allowed=[[NSSet alloc]initWithArray:@[@"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"]];});
|
||||
dispatch_once(&once,^{allowed=[[NSSet alloc]initWithArray:@[@"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",@"source_build",@"process_role",@"termination_namespace",@"termination_code",@"pid",@"resource_kind",@"memory_mb",@"cpu_percent",@"thread_count",@"uptime_s",@"max_duration_ms",@"average_ms",@"width",@"height",@"layer_count",@"mask_count",@"sample_status"]];});
|
||||
NSMutableDictionary *out=[NSMutableDictionary dictionary];
|
||||
if(![fields isKindOfClass:NSDictionary.class])return @{};
|
||||
for (NSString *key in fields) {
|
||||
@@ -43,9 +46,11 @@ NSDictionary *DYBetaSafeFields(NSDictionary *fields) {
|
||||
return out;
|
||||
}
|
||||
|
||||
#include "DYBetaEvidence.inc.h"
|
||||
|
||||
@interface DYBetaTransport : NSObject <NSURLSessionTaskDelegate> {
|
||||
@public
|
||||
dispatch_queue_t queue;
|
||||
dispatch_queue_t queue, evidenceQueue;
|
||||
dispatch_source_t timer;
|
||||
NSMutableArray *pending;
|
||||
NSMutableSet *seenCrashes;
|
||||
@@ -56,13 +61,18 @@ NSDictionary *DYBetaSafeFields(NSDictionary *fields) {
|
||||
NSNumber *build;
|
||||
NSURL *folder, *journal;
|
||||
NSDictionary *environment;
|
||||
NSTimeInterval nextAttempt, lastTick, lastStall;
|
||||
NSTimeInterval nextAttempt, lastTick, lastStall, lastMaintenance, lastSample, sampleWindow, previousCPU, previousResourceTime, startedAt;
|
||||
NSUInteger sampleCount;
|
||||
BOOL sampling;
|
||||
BOOL ready;
|
||||
}
|
||||
- (void)enqueue:(NSString *)event fields:(NSDictionary *)fields;
|
||||
- (void)drain;
|
||||
- (void)persist;
|
||||
- (void)scanCrashSummaries;
|
||||
- (NSUInteger)recoverPending;
|
||||
- (NSDictionary *)resources:(double)now;
|
||||
- (void)captureSample:(NSString *)stage;
|
||||
@end
|
||||
static DYBetaTransport *transport;
|
||||
static void publishStatus(NSDictionary *values) {
|
||||
@@ -79,6 +89,8 @@ static NSString *sysctlString(const char *key) {
|
||||
- (instancetype)init {
|
||||
if((self=[super init])) {
|
||||
queue=dispatch_queue_create("com.dayu.color.beta-diagnostics",DISPATCH_QUEUE_SERIAL);
|
||||
evidenceQueue=dispatch_queue_create("com.dayu.color.beta-evidence",DISPATCH_QUEUE_SERIAL);
|
||||
dispatch_set_target_queue(evidenceQueue,dispatch_get_global_queue(QOS_CLASS_UTILITY,0));
|
||||
pending=[NSMutableArray new];seenCrashes=[NSMutableSet new];lastEvents=[NSMutableDictionary new];sessionID=[NSUUID.UUID.UUIDString.lowercaseString copy];
|
||||
source=[([NSBundle.mainBundle.bundleIdentifier isEqual:@"com.dayu.color.XPC"]?@"plugin":@"app")copy];
|
||||
version=[[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]copy];build=@([[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]integerValue]);[build retain];
|
||||
@@ -89,6 +101,13 @@ static NSString *sysctlString(const char *key) {
|
||||
NSUserDefaults *prefs=preferences();[prefs registerDefaults:@{@"betaDiagnosticsEnabled":@YES}];gEnabled.store([prefs boolForKey:@"betaDiagnosticsEnabled"]);
|
||||
folder=[[[NSFileManager.defaultManager URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask].firstObject URLByAppendingPathComponent:@"com.dayu.color/Beta" isDirectory:YES]retain];
|
||||
[NSFileManager.defaultManager createDirectoryAtURL:folder withIntermediateDirectories:YES attributes:@{NSFilePosixPermissions:@0700} error:nil];
|
||||
// A process can exit while the independent sampler is writing. Only remove our stale samples.
|
||||
if([source isEqual:@"app"])for(NSURL *file in [NSFileManager.defaultManager contentsOfDirectoryAtURL:folder includingPropertiesForKeys:@[NSURLContentModificationDateKey] options:0 error:nil]) {
|
||||
NSString *name=file.lastPathComponent;
|
||||
if(![name hasPrefix:@"sample-"]||![[[NSUUID alloc]initWithUUIDString:[name substringFromIndex:7]]autorelease])continue;
|
||||
NSDate *date=nil;[file getResourceValue:&date forKey:NSURLContentModificationDateKey error:nil];
|
||||
if(date&&date.timeIntervalSinceNow< -300)[NSFileManager.defaultManager removeItemAtURL:file error:nil];
|
||||
}
|
||||
// O_EXCL gives the APP and XPC one random installation ID without hardware UUIDs.
|
||||
NSURL *identity=[folder URLByAppendingPathComponent:@"installation.txt"];
|
||||
NSString *newID=NSUUID.UUID.UUIDString.lowercaseString;
|
||||
@@ -108,12 +127,25 @@ static NSString *sysctlString(const char *key) {
|
||||
for(NSString *ID in @[@"com.apple.FinalCut",@"com.apple.FinalCutApp"]){NSURL *url=[NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:ID];if(url){fcp=[[NSBundle bundleWithURL:url]objectForInfoDictionaryKey:@"CFBundleShortVersionString"]?:@"unknown";break;}}
|
||||
environment=[@{@"model":sysctlString("hw.model"),@"os_version":NSProcessInfo.processInfo.operatingSystemVersionString,@"fcp_version":fcp,@"cpu_cores":@(NSProcessInfo.processInfo.processorCount),@"memory_gb":@(double(memory)/(1024*1024*1024))}copy];
|
||||
journal=[[folder URLByAppendingPathComponent:[NSString stringWithFormat:@"pending-%d-%@.json",getpid(),sessionID]]retain];
|
||||
NSArray *seen=[NSArray arrayWithContentsOfURL:[folder URLByAppendingPathComponent:@"seen-crashes.plist"]];
|
||||
for(id key in seen)if([key isKindOfClass:NSString.class]&&[[[NSUUID alloc]initWithUUIDString:key]autorelease])[seenCrashes addObject:key];
|
||||
NSUInteger recovered=[self recoverPending];
|
||||
ready=YES;gMainReply.store(NSProcessInfo.processInfo.systemUptime);lastTick=gMainReply.load();startedAt=lastTick;
|
||||
NSMutableDictionary *start=[[environment mutableCopy]autorelease];start[@"pid"]=@(getpid());[self enqueue:@"process_start" fields:start];if(recovered)[self enqueue:@"previous_session_pending" fields:@{@"count":@(recovered)}];
|
||||
publishStatus(@{@"installation_id":installationID,@"enabled":@(gEnabled.load()),@"pending":@(pending.count)});
|
||||
timer=dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER,0,0,queue);
|
||||
dispatch_source_set_timer(timer,dispatch_time(DISPATCH_TIME_NOW,2*NSEC_PER_SEC),3*NSEC_PER_SEC,NSEC_PER_SEC/4);
|
||||
dispatch_source_set_event_handler(timer,^{@autoreleasepool{[self tick];}});dispatch_resume(timer);
|
||||
[NSDistributedNotificationCenter.defaultCenter addObserver:self selector:@selector(settingsChanged:) name:@"com.dayu.color.beta.preferences" object:nil];
|
||||
if([source isEqual:@"app"])[self scanCrashSummaries];
|
||||
}
|
||||
- (NSUInteger)recoverPending {
|
||||
NSArray *files=[NSFileManager.defaultManager contentsOfDirectoryAtURL:folder includingPropertiesForKeys:@[NSURLContentModificationDateKey] options:NSDirectoryEnumerationSkipsHiddenFiles error:nil];
|
||||
NSUInteger recovered=0;
|
||||
for(NSURL *url in files){if(![url.lastPathComponent hasPrefix:@"pending-"]||![url.pathExtension isEqual:@"json"])continue;
|
||||
NSNumber *bytes=nil;[url getResourceValue:&bytes forKey:NSURLFileSizeKey error:nil];if(bytes.unsignedLongLongValue>384*1024)continue;
|
||||
NSDictionary *old=[NSJSONSerialization JSONObjectWithData:[NSData dataWithContentsOfURL:url]?:[NSData data] options:0 error:nil];if(![old isKindOfClass:NSDictionary.class])continue;
|
||||
if(![old[@"pid"]isKindOfClass:NSNumber.class])continue;int pid=[old[@"pid"]intValue];if(pid>0&&kill(pid,0)==0)continue;
|
||||
if(![old[@"pid"]isKindOfClass:NSNumber.class])continue;int pid=[old[@"pid"]intValue];if(pid==getpid()||pid<=0||kill(pid,0)==0||errno!=ESRCH)continue;
|
||||
NSDate *date=nil;[url getResourceValue:&date forKey:NSURLContentModificationDateKey error:nil];
|
||||
if(gEnabled.load()&&date.timeIntervalSinceNow> -7*86400&&[old[@"events"]isKindOfClass:NSArray.class])for(NSDictionary *event in old[@"events"]){if(pending.count>=256)break;
|
||||
if(![event isKindOfClass:NSDictionary.class]||![event[@"event_id"]isKindOfClass:NSString.class]||![event[@"session_id"]isKindOfClass:NSString.class]||
|
||||
@@ -123,36 +155,32 @@ static NSString *sysctlString(const char *key) {
|
||||
NSMutableDictionary *safe=[[event mutableCopy]autorelease];safe[@"fields"]=DYBetaSafeFields(event[@"fields"]);[pending addObject:safe];recovered++;}
|
||||
[NSFileManager.defaultManager removeItemAtURL:url error:nil];
|
||||
}
|
||||
ready=YES;gMainReply.store(NSProcessInfo.processInfo.systemUptime);lastTick=gMainReply.load();
|
||||
[self enqueue:@"process_start" fields:environment];if(recovered)[self enqueue:@"previous_session_pending" fields:@{@"count":@(recovered)}];
|
||||
publishStatus(@{@"installation_id":installationID,@"enabled":@(gEnabled.load()),@"pending":@(pending.count)});
|
||||
timer=dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER,0,0,queue);
|
||||
dispatch_source_set_timer(timer,dispatch_time(DISPATCH_TIME_NOW,2*NSEC_PER_SEC),3*NSEC_PER_SEC,NSEC_PER_SEC/4);
|
||||
dispatch_source_set_event_handler(timer,^{@autoreleasepool{[self tick];}});dispatch_resume(timer);
|
||||
[NSDistributedNotificationCenter.defaultCenter addObserver:self selector:@selector(settingsChanged:) name:@"com.dayu.color.beta.preferences" object:nil];
|
||||
if([source isEqual:@"app"])[self scanCrashSummaries];
|
||||
return recovered;
|
||||
}
|
||||
- (void)enqueue:(NSString *)event fields:(NSDictionary *)fields {
|
||||
if(!ready||!gEnabled.load())return;
|
||||
// A bad render must not turn diagnostics into per-frame disk writes.
|
||||
if([@[@"render_error",@"inspector_refresh"]containsObject:event]){
|
||||
double now=NSProcessInfo.processInfo.systemUptime;if(now-[lastEvents[event]doubleValue]<5)return;lastEvents[event]=@(now);
|
||||
if([@[@"render_error",@"inspector_refresh",@"render",@"plugin_state",@"tracking_frame"]containsObject:event]){
|
||||
double now=NSProcessInfo.processInfo.systemUptime;if(now-[lastEvents[event]doubleValue]<([event isEqual:@"render_error"]?5:30))return;lastEvents[event]=@(now);
|
||||
}
|
||||
if(pending.count>=256)[pending removeObjectsInRange:NSMakeRange(0,32)];
|
||||
[pending addObject:@{@"event_id":NSUUID.UUID.UUIDString.lowercaseString,@"session_id":sessionID,@"source":source,@"version":version?:@"0.0",@"build":build?:@1,@"event":event,@"occurred_at":@(NSDate.date.timeIntervalSince1970),@"fields":DYBetaSafeFields(fields?:@{})}];
|
||||
NSMutableDictionary *context=[[DYBetaSafeFields(fields?:@{})mutableCopy]autorelease];if(!context[@"pid"])context[@"pid"]=@(getpid());
|
||||
if([NSProcessInfo.processInfo.arguments containsObject:@"--diagnostics-probe"])context[@"phase"]=@"verification";
|
||||
[pending addObject:@{@"event_id":NSUUID.UUID.UUIDString.lowercaseString,@"session_id":sessionID,@"source":source,@"version":version?:@"0.0",@"build":build?:@1,@"event":event,@"occurred_at":@(NSDate.date.timeIntervalSince1970),@"fields":context}];
|
||||
[self persist];
|
||||
}
|
||||
- (void)persist {
|
||||
if(!journal)return;
|
||||
NSData *data=[NSJSONSerialization dataWithJSONObject:@{@"pid":@(getpid()),@"events":pending} options:0 error:nil];
|
||||
if(data.length>384*1024){while(pending.count>64)[pending removeObjectAtIndex:0];data=[NSJSONSerialization dataWithJSONObject:@{@"pid":@(getpid()),@"events":pending} options:0 error:nil];}
|
||||
while(data.length>384*1024&&pending.count>1){[pending removeObjectAtIndex:0];data=[NSJSONSerialization dataWithJSONObject:@{@"pid":@(getpid()),@"events":pending} options:0 error:nil];}
|
||||
[data writeToURL:journal options:NSDataWritingAtomic error:nil];chmod(journal.fileSystemRepresentation,0600);
|
||||
}
|
||||
- (void)drain {
|
||||
if(!ready||!gEnabled.load()||sending||!pending.count||NSDate.date.timeIntervalSince1970<nextAttempt)return;
|
||||
NSArray *batch=[[pending subarrayWithRange:NSMakeRange(0,MIN((NSUInteger)16,pending.count))]copy];
|
||||
NSData *data=[NSJSONSerialization dataWithJSONObject:@{@"bundle_id":@"com.dayu.color",@"installation_id":installationID,@"events":batch} options:0 error:nil];
|
||||
if(data.length>98304){[pending removeObjectAtIndex:0];[batch release];[self persist];return;}
|
||||
while(data.length>98304&&batch.count>1){NSArray *smaller=[[batch subarrayWithRange:NSMakeRange(0,batch.count-1)]copy];[batch release];batch=smaller;data=[NSJSONSerialization dataWithJSONObject:@{@"bundle_id":@"com.dayu.color",@"installation_id":installationID,@"events":batch} options:0 error:nil];}
|
||||
if(!data||data.length>98304){[pending removeObjectAtIndex:0];[batch release];[self persist];return;}
|
||||
NSMutableURLRequest *request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"https://dayu.media/wp-json/dayu-color/v1/diagnostics"]];request.HTTPMethod=@"POST";request.HTTPBody=data;[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
|
||||
sending=[[session dataTaskWithRequest:request completionHandler:^(NSData *body,NSURLResponse *response,NSError *error){
|
||||
dispatch_async(self->queue,^{@autoreleasepool{
|
||||
@@ -160,20 +188,66 @@ static NSString *sysctlString(const char *key) {
|
||||
NSSet *accepted=[reply[@"event_ids"]isKindOfClass:NSArray.class]?[NSSet setWithArray:reply[@"event_ids"]]:[NSSet set];
|
||||
NSSet *expected=[NSSet setWithArray:[batch valueForKey:@"event_id"]];
|
||||
BOOL ok=!error&&[(NSHTTPURLResponse*)response statusCode]==200&&[reply[@"accepted"]isKindOfClass:NSNumber.class]&&[reply[@"accepted"]boolValue]&&[accepted isEqualToSet:expected];
|
||||
if(ok){NSIndexSet *remove=[self->pending indexesOfObjectsPassingTest:^BOOL(NSDictionary *event,NSUInteger i,BOOL *stop){return [accepted containsObject:event[@"event_id"]];}];[self->pending removeObjectsAtIndexes:remove];self->nextAttempt=0;
|
||||
if(ok){
|
||||
BOOL acknowledgedCrash=NO;
|
||||
for(NSDictionary *event in batch)if([event[@"event"]isEqual:@"crash_summary"]){[self->seenCrashes addObject:event[@"event_id"]];acknowledgedCrash=YES;}
|
||||
if(acknowledgedCrash){NSArray *seen=self->seenCrashes.allObjects;if(seen.count>1024){seen=[seen subarrayWithRange:NSMakeRange(seen.count-1024,1024)];[self->seenCrashes setSet:[NSSet setWithArray:seen]];}
|
||||
NSURL *seenURL=[self->folder URLByAppendingPathComponent:@"seen-crashes.plist"];[seen writeToURL:seenURL atomically:YES];chmod(seenURL.fileSystemRepresentation,0600);}
|
||||
NSIndexSet *remove=[self->pending indexesOfObjectsPassingTest:^BOOL(NSDictionary *event,NSUInteger i,BOOL *stop){return [accepted containsObject:event[@"event_id"]];}];[self->pending removeObjectsAtIndexes:remove];self->nextAttempt=0;
|
||||
publishStatus(@{@"installation_id":self->installationID,@"enabled":@(gEnabled.load()),@"pending":@(self->pending.count),@"last_upload":@([NSDate.date timeIntervalSince1970])});
|
||||
}else self->nextAttempt=NSDate.date.timeIntervalSince1970+30;
|
||||
[self->sending release];self->sending=nil;[batch release];[self persist];
|
||||
}});
|
||||
}]retain];[sending resume];
|
||||
}
|
||||
- (NSDictionary *)resources:(double)now {
|
||||
struct proc_taskinfo info={};NSMutableDictionary *result=[NSMutableDictionary dictionaryWithDictionary:@{@"pid":@(getpid()),@"uptime_s":@(now-startedAt)}];
|
||||
if(proc_pidinfo(getpid(),PROC_PIDTASKINFO,0,&info,sizeof(info))==sizeof(info)) {
|
||||
result[@"memory_mb"]=@(double(info.pti_resident_size)/(1024*1024));result[@"thread_count"]=@(info.pti_threadnum);
|
||||
double cpu=(info.pti_total_user+info.pti_total_system)/1e9;
|
||||
if(previousResourceTime>0&&now>previousResourceTime)result[@"cpu_percent"]=@(MAX(0.,(cpu-previousCPU)/(now-previousResourceTime)*100));
|
||||
previousCPU=cpu;previousResourceTime=now;
|
||||
}return result;
|
||||
}
|
||||
- (void)captureSample:(NSString *)stage {
|
||||
double now=NSProcessInfo.processInfo.systemUptime;
|
||||
if(sampling||now-lastSample<120)return;
|
||||
if(now-sampleWindow>3600){sampleWindow=now;sampleCount=0;}if(sampleCount>=6)return;
|
||||
sampling=YES;lastSample=now;sampleCount++;
|
||||
dispatch_async(evidenceQueue,^{@autoreleasepool{
|
||||
NSURL *output=[self->folder URLByAppendingPathComponent:[@"sample-" stringByAppendingString:NSUUID.UUID.UUIDString]];
|
||||
NSTask *task=[[[NSTask alloc]init]autorelease];task.executableURL=[NSURL fileURLWithPath:@"/usr/bin/sample"];
|
||||
// Sample first, then symbolize; -mayDie preloads symbols and can miss a short hang.
|
||||
task.arguments=@[[@(getpid())stringValue],@"1",@"10",@"-file",output.path];
|
||||
task.standardOutput=[NSFileHandle fileHandleWithNullDevice];task.standardError=[NSFileHandle fileHandleWithNullDevice];
|
||||
NSString *result=@"unavailable",*frames=@"";NSError *error=nil;
|
||||
if(gEnabled.load()&&[task launchAndReturnError:&error]) {
|
||||
double deadline=NSProcessInfo.processInfo.systemUptime+30;
|
||||
while(task.running&&gEnabled.load()&&NSProcessInfo.processInfo.systemUptime<deadline)[NSThread sleepForTimeInterval:.05];
|
||||
if(task.running){[task terminate];[NSThread sleepForTimeInterval:.1];if(task.running)kill(task.processIdentifier,SIGKILL);result=@"timeout_or_disabled";}
|
||||
else if(task.terminationStatus==0){NSNumber *size=nil;[output getResourceValue:&size forKey:NSURLFileSizeKey error:nil];if(size.unsignedLongLongValue<=4*1024*1024)frames=DYBetaSampleFrames([NSString stringWithContentsOfURL:output encoding:NSUTF8StringEncoding error:nil]);result=frames.length?@"captured":@"no_frames";}
|
||||
}
|
||||
[NSFileManager.defaultManager removeItemAtURL:output error:nil];
|
||||
dispatch_async(self->queue,^{@autoreleasepool{self->sampling=NO;[self enqueue:@"hang_sample" fields:@{@"stage":stage,@"sample_status":result,@"frames":frames,@"pid":@(getpid())}];[self drain];}});
|
||||
}});
|
||||
}
|
||||
- (void)tick {
|
||||
double now=NSProcessInfo.processInfo.systemUptime;
|
||||
if(now-lastTick>15)gMainReply.store(now); // Sleep/wake and timer coalescing are not proof of a hang.
|
||||
lastTick=now;
|
||||
if(gEnabled.load()&&now-gMainReply.load()>6&&now-lastStall>30){lastStall=now;[self enqueue:@"main_thread_stall" fields:@{@"status":@"suspected",@"main_delay_ms":@((now-gMainReply.load())*1000),@"active_stages":[self activeStages:now]}];}
|
||||
else if(gEnabled.load()&&now-lastStall>30){NSString *stages=[self activeStages:now];if(stages.length){lastStall=now;[self enqueue:@"operation_stall" fields:@{@"status":@"suspected",@"active_stages":stages}];}}
|
||||
dispatch_async(dispatch_get_main_queue(),^{gMainReply.store(NSProcessInfo.processInfo.systemUptime);});
|
||||
BOOL suspended=now-lastTick>15;lastTick=now;
|
||||
if(suspended)gMainReply.store(now); // Sleep/wake or process suspension isn't a measured hang.
|
||||
if(gEnabled.load()) {
|
||||
NSString *stages=[self activeStages:now];double delay=now-gMainReply.load();
|
||||
if((delay>6||stages.length)&&now-lastStall>30){lastStall=now;NSMutableDictionary *fields=[[[self resources:now]mutableCopy]autorelease];
|
||||
fields[@"status"]=@"suspected";fields[@"main_delay_ms"]=@(delay*1000);fields[@"active_stages"]=stages;
|
||||
NSString *event=delay>6?@"main_thread_stall":@"operation_stall";[self enqueue:event fields:fields];[self captureSample:event];
|
||||
}
|
||||
if(now-lastMaintenance>=60){lastMaintenance=now;
|
||||
[self enqueue:@"process_health" fields:[self resources:now]];
|
||||
NSDictionary *metrics;@synchronized(gSpanLock){metrics=[[gMetrics copy]autorelease];[gMetrics removeAllObjects];}
|
||||
for(NSString *stage in metrics){NSMutableDictionary *fields=[[metrics[stage]mutableCopy]autorelease];fields[@"stage"]=stage;fields[@"average_ms"]=@([fields[@"duration_ms"]doubleValue]/MAX(1,[fields[@"count"]integerValue]));[self enqueue:@"performance_summary" fields:fields];}
|
||||
if([source isEqual:@"app"]){NSUInteger recovered=[self recoverPending];if(recovered)[self enqueue:@"previous_session_pending" fields:@{@"count":@(recovered)}];[self scanCrashSummaries];}
|
||||
}
|
||||
}
|
||||
[self drain];
|
||||
}
|
||||
- (NSString *)activeStages:(double)now {
|
||||
@@ -183,7 +257,7 @@ static NSString *sysctlString(const char *key) {
|
||||
}
|
||||
- (void)settingsChanged:(NSNotification *)note {
|
||||
dispatch_async(queue,^{@autoreleasepool{NSUserDefaults *prefs=preferences();[prefs synchronize];gEnabled.store([prefs objectForKey:@"betaDiagnosticsEnabled"]?[prefs boolForKey:@"betaDiagnosticsEnabled"]:YES);
|
||||
if(!gEnabled.load()){[self->sending cancel];[self->pending removeAllObjects];[self persist];}
|
||||
if(!gEnabled.load()){[self->sending cancel];[self->pending removeAllObjects];[self persist];@synchronized(gSpanLock){[gActive removeAllObjects];[gMetrics removeAllObjects];}}
|
||||
publishStatus(@{@"installation_id":self->installationID?:@"",@"enabled":@(gEnabled.load()),@"pending":@(self->pending.count)});
|
||||
}});
|
||||
}
|
||||
@@ -191,34 +265,44 @@ static NSString *sysctlString(const char *key) {
|
||||
completionHandler(DYBetaAllowedURL(request.URL,NO)?request:nil);
|
||||
}
|
||||
- (void)scanCrashSummaries {
|
||||
if(!gEnabled.load())return;
|
||||
if(!gEnabled.load()||![source isEqual:@"app"])return;
|
||||
NSURL *reports=[NSFileManager.defaultManager.homeDirectoryForCurrentUser URLByAppendingPathComponent:@"Library/Logs/DiagnosticReports"];
|
||||
NSArray *files=[NSFileManager.defaultManager contentsOfDirectoryAtURL:reports includingPropertiesForKeys:@[NSURLContentModificationDateKey,NSURLFileSizeKey] options:NSDirectoryEnumerationSkipsHiddenFiles error:nil];
|
||||
NSUInteger count=0;
|
||||
for(NSURL *url in files){if(count>=12)break;if(![url.pathExtension isEqual:@"ips"])continue;
|
||||
files=[files sortedArrayUsingComparator:^NSComparisonResult(NSURL *a,NSURL *b){NSDate *ad=nil,*bd=nil;[a getResourceValue:&ad forKey:NSURLContentModificationDateKey error:nil];[b getResourceValue:&bd forKey:NSURLContentModificationDateKey error:nil];return [(bd?:NSDate.distantPast) compare:ad?:NSDate.distantPast];}];
|
||||
NSUInteger count=0,examined=0;
|
||||
NSMutableSet *queued=[NSMutableSet setWithArray:[pending valueForKey:@"event_id"]];
|
||||
for(NSURL *url in files){if(count>=12||examined++>=512||pending.count>=240)break;
|
||||
if(![url.pathExtension isEqual:@"ips"]||![url.lastPathComponent hasPrefix:@"大鱼调色"])continue;
|
||||
NSNumber *size=nil;[url getResourceValue:&size forKey:NSURLFileSizeKey error:nil];if(size.unsignedLongLongValue>8*1024*1024)continue;
|
||||
NSDate *date=nil;[url getResourceValue:&date forKey:NSURLContentModificationDateKey error:nil];if(date.timeIntervalSinceNow< -7*86400)continue;
|
||||
NSFileHandle *handle=[NSFileHandle fileHandleForReadingFromURL:url error:nil];NSData *head=[handle readDataUpToLength:8192 error:nil];[handle closeFile];
|
||||
if(!head.length)continue;NSString *prefix=[[[NSString alloc]initWithData:head encoding:NSUTF8StringEncoding]autorelease];NSRange first=[prefix rangeOfString:@"\n"];if(!prefix||first.location==NSNotFound)continue;
|
||||
NSDictionary *header=[NSJSONSerialization JSONObjectWithData:[[prefix substringToIndex:first.location]dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];if(![header isKindOfClass:NSDictionary.class]||![header[@"bundleID"]isEqual:@"com.dayu.color.XPC"])continue;
|
||||
NSData *data=[NSData dataWithContentsOfURL:url options:NSDataReadingMappedIfSafe error:nil];if(!data.length)continue;NSString *text=[[[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding]autorelease];NSRange newline=[text rangeOfString:@"\n"];if(!text||newline.location==NSNotFound)continue;
|
||||
NSString *key=header[@"incident_id"];if(![key isKindOfClass:NSString.class]||![[[NSUUID alloc]initWithUUIDString:key]autorelease])continue;if([seenCrashes containsObject:key])continue;[seenCrashes addObject:key];
|
||||
NSDictionary *body=[NSJSONSerialization JSONObjectWithData:[[text substringFromIndex:newline.location+1]dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];
|
||||
if(![body isKindOfClass:NSDictionary.class])continue;NSDictionary *exception=[body[@"exception"]isKindOfClass:NSDictionary.class]?body[@"exception"]:@{};
|
||||
NSInteger fault=[body[@"faultingThread"]isKindOfClass:NSNumber.class]?[body[@"faultingThread"]integerValue]:-1;NSArray *threads=body[@"threads"];NSMutableArray *frames=[NSMutableArray array];
|
||||
if([threads isKindOfClass:NSArray.class]&&fault>=0&&fault<threads.count&&[threads[fault]isKindOfClass:NSDictionary.class]&&[threads[fault][@"frames"]isKindOfClass:NSArray.class])for(NSDictionary *frame in threads[fault][@"frames"]){if(frames.count>=30)break;if(![frame isKindOfClass:NSDictionary.class])continue;NSString *symbol=frame[@"symbol"];if([symbol isKindOfClass:NSString.class]&&![symbol containsString:@"/"])[frames addObject:symbol];}
|
||||
[self enqueue:@"crash_summary" fields:@{@"source_version":header[@"app_version"]?:@"unknown",@"report_time":header[@"timestamp"]?:@"unknown",@"exception":exception[@"type"]?:@"unknown",@"signal":exception[@"signal"]?:@"unknown",@"frames":[frames componentsJoinedByString:@"\n"]}];
|
||||
if(pending.count){NSMutableDictionary *event=[[pending.lastObject mutableCopy]autorelease];event[@"event_id"]=key.lowercaseString;[pending replaceObjectAtIndex:pending.count-1 withObject:event];[self persist];}count++;
|
||||
NSDate *date=nil;[url getResourceValue:&date forKey:NSURLContentModificationDateKey error:nil];if(!date||date.timeIntervalSinceNow< -7*86400)continue;
|
||||
NSData *data=[NSData dataWithContentsOfURL:url options:NSDataReadingMappedIfSafe error:nil];if(!data.length)continue;
|
||||
NSString *text=[[[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding]autorelease];if(!text)continue;
|
||||
NSRange newline=[text rangeOfString:@"\n"];if(newline.location==NSNotFound)continue;
|
||||
NSDictionary *header=DYBetaDictionary([NSJSONSerialization JSONObjectWithData:[[text substringToIndex:newline.location]dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil]);
|
||||
NSString *key=DYBetaString(header[@"incident_id"]).lowercaseString;
|
||||
if(![[[NSUUID alloc]initWithUUIDString:key]autorelease]||[seenCrashes containsObject:key]||[queued containsObject:key])continue;
|
||||
NSDictionary *body=DYBetaDictionary([NSJSONSerialization JSONObjectWithData:[[text substringFromIndex:newline.location+1]dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil]);
|
||||
if(!body.count)continue;NSDictionary *fields=DYBetaCrashEvidence(header,body);if(!fields)continue;
|
||||
NSUInteger before=pending.count;[self enqueue:@"crash_summary" fields:fields];
|
||||
if(pending.count==before+1){NSMutableDictionary *event=[[pending.lastObject mutableCopy]autorelease];event[@"event_id"]=key;[pending replaceObjectAtIndex:pending.count-1 withObject:event];[queued addObject:key];[self persist];count++;}
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
void DYBetaStart(void) {
|
||||
static dispatch_once_t once;dispatch_once(&once,^{
|
||||
NSString *ID=NSBundle.mainBundle.bundleIdentifier;
|
||||
gProduct=([ID isEqual:@"com.dayu.color"]||[ID isEqual:@"com.dayu.color.XPC"])&&![NSProcessInfo.processInfo.arguments containsObject:@"--self-test"];
|
||||
gSpanLock=[NSObject new];gStatusLock=[NSObject new];gActive=[NSMutableDictionary new];
|
||||
if(gProduct)transport=[DYBetaTransport new];
|
||||
gSpanLock=[NSObject new];gStatusLock=[NSObject new];gActive=[NSMutableDictionary new];gMetrics=[NSMutableDictionary new];
|
||||
if(gProduct){
|
||||
NSUserDefaults *prefs=preferences();gEnabled.store([prefs objectForKey:@"betaDiagnosticsEnabled"]?[prefs boolForKey:@"betaDiagnosticsEnabled"]:YES);
|
||||
gMainReply.store(NSProcessInfo.processInfo.systemUptime);
|
||||
// Common modes continue to pulse while menus / file panels run nested loops.
|
||||
CFRunLoopTimerRef pulse=CFRunLoopTimerCreate(NULL,CFAbsoluteTimeGetCurrent()+1,1,0,0,mainPulse,NULL);
|
||||
CFRunLoopAddTimer(CFRunLoopGetMain(),pulse,kCFRunLoopCommonModes);CFRelease(pulse);
|
||||
transport=[DYBetaTransport new];
|
||||
}
|
||||
});
|
||||
}
|
||||
BOOL DYBetaEnabled(void){DYBetaStart();return gEnabled.load();}
|
||||
@@ -226,8 +310,15 @@ void DYBetaSetEnabled(BOOL enabled){DYBetaStart();gEnabled.store(enabled);NSUser
|
||||
NSDictionary *DYBetaStatus(void){DYBetaStart();return statusSnapshot();}
|
||||
void DYBetaEvent(NSString *event,NSDictionary *fields){DYBetaStart();if(!gProduct||!gEnabled.load())return;NSDictionary *safe=DYBetaSafeFields(fields?:@{});dispatch_async(transport->queue,^{@autoreleasepool{[transport enqueue:event fields:safe];}});}
|
||||
uint64_t DYBetaSpanBegin(NSString *stage,NSDictionary *fields){DYBetaStart();if(!gProduct||!gEnabled.load())return 0;uint64_t token=++gSpan;NSDictionary *value=@{@"stage":stage,@"start":@(NSProcessInfo.processInfo.systemUptime),@"fields":DYBetaSafeFields(fields?:@{})};@synchronized(gSpanLock){if(gActive.count>=128)return 0;gActive[@(token)]=value;}
|
||||
if(![stage isEqual:@"inspector_refresh"]){NSMutableDictionary *begin=[[value[@"fields"]mutableCopy]autorelease];begin[@"phase"]=@"begin";DYBetaEvent(stage,begin);}return token;
|
||||
if(![@[@"inspector_refresh",@"render",@"tracking_frame",@"plugin_state"]containsObject:stage]){NSMutableDictionary *begin=[[value[@"fields"]mutableCopy]autorelease];begin[@"phase"]=@"begin";DYBetaEvent(stage,begin);}return token;
|
||||
}
|
||||
void DYBetaSpanEnd(uint64_t token,NSDictionary *fields){if(!token)return;NSDictionary *span;@synchronized(gSpanLock){span=[[gActive[@(token)]retain]autorelease];[gActive removeObjectForKey:@(token)];}if(!span)return;double elapsed=(NSProcessInfo.processInfo.systemUptime-[span[@"start"]doubleValue])*1000;if([span[@"stage"]isEqual:@"inspector_refresh"]&&elapsed<100)return;NSMutableDictionary *result=[[span[@"fields"]mutableCopy]autorelease];[result addEntriesFromDictionary:fields?:@{}];result[@"duration_ms"]=@(elapsed);result[@"phase"]=@"end";DYBetaEvent(span[@"stage"],result);}
|
||||
void DYBetaStop(void){DYBetaEvent(@"process_exit",@{@"status":@"normal"});}
|
||||
void DYBetaSpanEnd(uint64_t token,NSDictionary *fields){
|
||||
if(!token)return;NSDictionary *span;
|
||||
@synchronized(gSpanLock){span=[[gActive[@(token)]retain]autorelease];[gActive removeObjectForKey:@(token)];}
|
||||
if(!span||!gEnabled.load())return;double elapsed=(NSProcessInfo.processInfo.systemUptime-[span[@"start"]doubleValue])*1000;
|
||||
NSString *stage=span[@"stage"];BOOL frequent=[@[@"inspector_refresh",@"render",@"tracking_frame",@"plugin_state"]containsObject:stage];
|
||||
if(frequent){@synchronized(gSpanLock){NSDictionary *old=gMetrics[stage];gMetrics[stage]=@{@"count":@([old[@"count"]integerValue]+1),@"duration_ms":@([old[@"duration_ms"]doubleValue]+elapsed),@"max_duration_ms":@(MAX([old[@"max_duration_ms"]doubleValue],elapsed))};}if(elapsed<100)return;}
|
||||
NSMutableDictionary *result=[[span[@"fields"]mutableCopy]autorelease];[result addEntriesFromDictionary:fields?:@{}];result[@"duration_ms"]=@(elapsed);result[@"phase"]=@"end";DYBetaEvent(stage,result);
|
||||
}
|
||||
void DYBetaStop(void){DYBetaStart();if(!gProduct)return;dispatch_group_t group=dispatch_group_create();dispatch_group_async(group,transport->queue,^{@autoreleasepool{[transport enqueue:@"process_exit" fields:@{@"status":@"normal"}];[transport persist];[transport drain];}});dispatch_group_wait(group,dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC/2));dispatch_release(group);}
|
||||
void DYBetaSendSummary(void){DYBetaStart();if(!gProduct)return;dispatch_async(transport->queue,^{@autoreleasepool{[transport enqueue:@"diagnostic_summary" fields:transport->environment];[transport scanCrashSummaries];[transport drain];}});}
|
||||
@@ -0,0 +1,78 @@
|
||||
// Only structured, product-owned evidence leaves the computer. No raw IPS/sample upload.
|
||||
static NSString *DYBetaString(id value) { return [value isKindOfClass:NSString.class]?value:@""; }
|
||||
static NSDictionary *DYBetaDictionary(id value) { return [value isKindOfClass:NSDictionary.class]?value:@{}; }
|
||||
static NSArray *DYBetaArray(id value) { return [value isKindOfClass:NSArray.class]?value:@[]; }
|
||||
static NSString *DYBetaImageName(NSDictionary *image) {
|
||||
NSString *name=DYBetaString(image[@"name"]);
|
||||
if([@[@"大鱼调色",@"大鱼调色 XPC Service",@"FxPlug",@"PluginManager"]containsObject:name])return name;
|
||||
NSString *path=DYBetaString(image[@"path"]);
|
||||
if([path hasPrefix:@"/System/Library/"]||[path hasPrefix:@"/usr/lib/"])return name.lastPathComponent;
|
||||
return @"other-image";
|
||||
}
|
||||
NSDictionary *DYBetaCrashEvidence(NSDictionary *header,NSDictionary *body) {
|
||||
header=DYBetaDictionary(header);body=DYBetaDictionary(body);
|
||||
NSString *bundle=DYBetaString(header[@"bundleID"]);
|
||||
if(![@[@"com.dayu.color",@"com.dayu.color.XPC"]containsObject:bundle])return nil;
|
||||
NSArray *threads=DYBetaArray(body[@"threads"]),*images=DYBetaArray(body[@"usedImages"]);
|
||||
// Development self-tests must not be presented as users' crashes.
|
||||
for(id t in threads)for(id f in DYBetaArray(DYBetaDictionary(t)[@"frames"])) {
|
||||
NSString *symbol=DYBetaString(DYBetaDictionary(f)[@"symbol"]);
|
||||
if([symbol containsString:@"DYRunDiagnostics"]||[symbol containsString:@"__asan"]||[symbol containsString:@"__sanitizer"])return nil;
|
||||
}
|
||||
NSInteger fault=[body[@"faultingThread"]isKindOfClass:NSNumber.class]?[body[@"faultingThread"]integerValue]:-1;
|
||||
if(fault<0||fault>=threads.count)for(NSUInteger i=0;i<threads.count;i++)if([DYBetaDictionary(threads[i])[@"triggered"]boolValue]){fault=i;break;}
|
||||
NSMutableArray *frames=[NSMutableArray array];
|
||||
if(fault>=0&&fault<threads.count)for(id item in DYBetaArray(DYBetaDictionary(threads[fault])[@"frames"])) {
|
||||
if(frames.count>=32)break;NSDictionary *frame=DYBetaDictionary(item);
|
||||
NSInteger index=[frame[@"imageIndex"]isKindOfClass:NSNumber.class]?[frame[@"imageIndex"]integerValue]:-1;
|
||||
NSDictionary *image=index>=0&&index<images.count?DYBetaDictionary(images[index]):@{};
|
||||
NSString *uuid=DYBetaString(image[@"uuid"]);if(![[[NSUUID alloc]initWithUUIDString:uuid]autorelease])uuid=@"unknown";
|
||||
NSString *symbol=DYBetaString(frame[@"symbol"]);
|
||||
if(symbol.length>300)symbol=[symbol substringToIndex:300];
|
||||
if([symbol containsString:@"/"])symbol=@"[symbol omitted]";
|
||||
[frames addObject:[NSString stringWithFormat:@"%@ | %@ + %@ | %@",symbol.length?symbol:@"unsymbolicated",DYBetaImageName(image),[frame[@"imageOffset"]isKindOfClass:NSNumber.class]?frame[@"imageOffset"]:@0,uuid]];
|
||||
}
|
||||
NSDictionary *exception=DYBetaDictionary(body[@"exception"]),*termination=DYBetaDictionary(body[@"termination"]),*info=DYBetaDictionary(body[@"bundleInfo"]);
|
||||
NSMutableDictionary *out=[@{@"source_version":DYBetaString(header[@"app_version"]).length?header[@"app_version"]:DYBetaString(info[@"CFBundleShortVersionString"]),
|
||||
@"source_build":DYBetaString(header[@"build_version"]).length?header[@"build_version"]:DYBetaString(info[@"CFBundleVersion"]),
|
||||
@"process_role":[bundle hasSuffix:@".XPC"]?@"plugin":@"app",@"report_time":DYBetaString(header[@"timestamp"]),
|
||||
@"exception":DYBetaString(exception[@"type"]),@"signal":DYBetaString(exception[@"signal"]),
|
||||
@"termination_namespace":DYBetaString(termination[@"namespace"]),@"frames":[frames componentsJoinedByString:@"\n"],
|
||||
@"os_version":DYBetaString(DYBetaDictionary(body[@"osVersion"])[@"train"])}mutableCopy];
|
||||
if([termination[@"code"]isKindOfClass:NSNumber.class])out[@"termination_code"]=termination[@"code"];
|
||||
if([body[@"pid"]isKindOfClass:NSNumber.class])out[@"pid"]=body[@"pid"];
|
||||
// Full dyld reason may contain user paths. Retain only a fixed classification.
|
||||
NSString *reason=[[DYBetaArray(termination[@"details"]) description]stringByAppendingString:DYBetaString(termination[@"indicator"])];
|
||||
out[@"status"]=[reason localizedCaseInsensitiveContainsString:@"Library not loaded"]?@"library_missing":
|
||||
[reason localizedCaseInsensitiveContainsString:@"Symbol not found"]?@"symbol_missing":
|
||||
[reason localizedCaseInsensitiveContainsString:@"signature"]?@"signature_rejected":@"system_report";
|
||||
NSDictionary *safe=DYBetaSafeFields(out);[out release];return safe;
|
||||
}
|
||||
NSString *DYBetaSampleFrames(NSString *sample) {
|
||||
if(![sample isKindOfClass:NSString.class]||sample.length>4*1024*1024)return @"";
|
||||
NSMutableArray *main=[NSMutableArray array],*other=[NSMutableArray array];BOOL graph=NO,mainThread=NO;
|
||||
for(NSString *line in [sample componentsSeparatedByString:@"\n"]) {
|
||||
if([line isEqual:@"Call graph:"]){graph=YES;continue;}
|
||||
if([line hasPrefix:@"Total number in stack"]||[line hasPrefix:@"Binary Images:"])break;
|
||||
if(!graph)continue;
|
||||
if([line containsString:@"Thread_"]){mainThread=[line containsString:@"com.apple.main-thread"];continue;}
|
||||
NSRange marker=[line rangeOfString:@" (in "];if(marker.location==NSNotFound)continue;
|
||||
NSString *frame=[line stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
|
||||
if(frame.length>500)frame=[frame substringToIndex:500];
|
||||
if([frame containsString:@"/"])continue;
|
||||
if(mainThread)[main addObject:frame];
|
||||
else if(other.count<25&&([frame containsString:@"DY"]||[frame containsString:@"大鱼调色"]||[frame containsString:@"Metal"]||[frame containsString:@"Vision"]||[frame containsString:@"cv::"]))[other addObject:frame];
|
||||
}
|
||||
// Keep the deepest main-thread frames, which contain the actual wait/work.
|
||||
if(main.count>28)[main removeObjectsInRange:NSMakeRange(0,main.count-28)];
|
||||
NSString *result=[NSString stringWithFormat:@"main:\n%@\nproduct/work:\n%@",[main componentsJoinedByString:@"\n"],[other componentsJoinedByString:@"\n"]];
|
||||
return main.count||other.count?DYBetaSafeFields(@{@"frames":result})[@"frames"]:@"";
|
||||
}
|
||||
NSDictionary *DYBetaErrorFields(NSError *error,NSString *stage) {
|
||||
NSMutableDictionary *fields=[NSMutableDictionary dictionaryWithDictionary:@{@"stage":stage?:@"unknown",@"error_domain":error.domain?:@"unknown",@"error_code":@(error.code)}];
|
||||
id url=error.userInfo[NSURLErrorKey];NSString *path=[url isKindOfClass:NSURL.class]?[url path]:DYBetaString(error.userInfo[NSFilePathErrorKey]);
|
||||
NSString *ext=path.pathExtension.lowercaseString;
|
||||
if([@[@"cube",@"dylut",@"metallib",@"bin"]containsObject:ext])fields[@"resource_kind"]=ext;
|
||||
else if(path.length)fields[@"resource_kind"]=@"other_file";
|
||||
return fields;
|
||||
}
|
||||
@@ -121,9 +121,8 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
@property(assign) NSProgressIndicator *progress;
|
||||
@property(assign) DYSurface *registrationCard;
|
||||
@property DYRegistrationState registrationState;
|
||||
@property BOOL keepOpen, terminating;
|
||||
@property NSInteger secondsRemaining;
|
||||
@property(retain) NSTimer *exitTimer;
|
||||
@property BOOL terminating;
|
||||
@property(retain) NSStatusItem *statusItem;
|
||||
@property(retain) NSMutableDictionary *diagnostics;
|
||||
@property(retain) DYBetaUpdater *updater;
|
||||
@property(assign) NSTextField *updateTitle, *updateDetail, *diagnosticDetail, *reportID;
|
||||
@@ -137,18 +136,16 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
|
||||
@implementation AppDelegate
|
||||
- (void)applicationDidFinishLaunching:(NSNotification *)notification {
|
||||
self.keepOpen = [NSProcessInfo.processInfo.arguments containsObject:@"--show-introduction"];
|
||||
self.window.title = @"大鱼调色";
|
||||
self.window.appearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
|
||||
self.window.titlebarAppearsTransparent = YES; self.window.backgroundColor = DYColor(.105,.14,.20);
|
||||
self.window.contentMinSize = NSMakeSize(760,620); [self.window setContentSize:NSMakeSize(920,850)]; [self.window center];
|
||||
DYBetaStart();
|
||||
[self buildInterface]; [self buildMenu];
|
||||
[self buildInterface]; [self buildMenu]; [self buildStatusItem];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(refreshDiagnostics:) name:DYBetaDiagnosticsChanged object:nil];
|
||||
self.updater = [[[DYBetaUpdater alloc] init] autorelease];
|
||||
__block AppDelegate *owner = self;
|
||||
self.updater.changed = ^(NSDictionary *state) { [owner updateChanged:state]; };
|
||||
self.updateProgressTimer = [NSTimer scheduledTimerWithTimeInterval:.2 target:self selector:@selector(refreshUpdateProgress:) userInfo:nil repeats:YES];
|
||||
NSInteger expected=[NSUserDefaults.standardUserDefaults integerForKey:@"betaPendingUpdateBuild"];
|
||||
if(expected>0 && [NSBundle.mainBundle.infoDictionary[@"CFBundleVersion"]integerValue]>=expected){
|
||||
DYBetaEvent(@"update_installer",@{@"status":@"completed",@"count":@(expected)});
|
||||
@@ -157,6 +154,14 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
[NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(accessibilityChanged:)
|
||||
name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil];
|
||||
[self.window makeKeyAndOrderFront:nil]; [self refreshDiagnostics:nil]; [self checkRegistration:nil]; [self.updater check];
|
||||
// Explicit QA opt-in on the signed, installed wrapper only. Never stalls the host.
|
||||
if([NSProcessInfo.processInfo.arguments containsObject:@"--diagnostics-probe"])
|
||||
[self performSelector:@selector(runDiagnosticsProbe) withObject:nil afterDelay:5];
|
||||
}
|
||||
- (void)runDiagnosticsProbe {
|
||||
DYBetaEvent(@"diagnostic_summary",@{@"status":@"probe_begin"});
|
||||
[NSThread sleepForTimeInterval:12];
|
||||
DYBetaEvent(@"diagnostic_summary",@{@"status":@"probe_recovered"});
|
||||
}
|
||||
- (void)buildMenu {
|
||||
NSMenu *menu = [[[NSMenu alloc] initWithTitle:@"大鱼调色"] autorelease];
|
||||
@@ -203,12 +208,12 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
self.progress.style = NSProgressIndicatorStyleBar; self.progress.indeterminate = YES; self.progress.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
self.retryButton = DYButton(@"检查中…",DYBlue(),NO,self,@selector(checkRegistration:));
|
||||
self.keepButton = DYButton(@"查看功能介绍",DYColor(.20,.46,.94),YES,self,@selector(keepIntroduction:));
|
||||
self.exitDetail = DYLabel(@"注册成功后,将显示 3 秒退出倒计时。",15,NSFontWeightSemibold,DYGreen());
|
||||
self.exitDetail = DYLabel(@"应用会保持运行,关闭窗口后继续后台诊断。",15,NSFontWeightSemibold,DYGreen());
|
||||
[self.exitDetail.heightAnchor constraintGreaterThanOrEqualToConstant:38].active = YES;
|
||||
NSStackView *registration = DYStack(@[DYHeading(@"puzzlepiece.extension",@"插件连接",DYBlue()),self.statusTitle,self.statusDetail,self.progress,
|
||||
self.exitDetail,DYStack(@[self.retryButton,self.keepButton],NSUserInterfaceLayoutOrientationHorizontal,8)],NSUserInterfaceLayoutOrientationVertical,13);
|
||||
self.registrationCard = DYCard(DYBlue(),registration);
|
||||
self.confirmationButton = DYButton(@"已确认正常,退出",DYGreen(),NO,self,@selector(confirmHost:));
|
||||
self.confirmationButton = DYButton(@"已确认,后台运行",DYGreen(),NO,self,@selector(confirmHost:));
|
||||
self.confirmationButton.enabled = NO;
|
||||
self.confirmationButton.toolTip = @"请先在 Final Cut Pro 中应用大鱼调色并确认效果正常,再点击此按钮。";
|
||||
NSStackView *host = DYStack(@[DYHeading(@"play.rectangle",@"在 Final Cut Pro 中检查",DYGreen()),
|
||||
@@ -237,7 +242,7 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
self.reportID=DYLabel(@"报告标识准备中…",10,NSFontWeightRegular,DYSecondary());self.reportID.selectable=YES;
|
||||
self.sendSummaryButton=DYButton(@"发送诊断摘要",DYColor(.67,.59,1),NO,self,@selector(sendSummary:));
|
||||
DYSurface *diagnosticCard=DYCard(DYColor(.67,.59,1),DYStack(@[DYHeading(@"waveform.path.ecg",@"一起完善大鱼调色",DYColor(.67,.59,1)),self.diagnosticToggle,
|
||||
DYLabel(@"仅发送版本、系统环境、加载耗时和本插件错误摘要;不发送素材、预设或账号。可随时关闭,诊断保留 30 天。",12,NSFontWeightRegular,DYSecondary()),
|
||||
DYLabel(@"后台自动发送版本、系统环境、阶段耗时、内存及本产品崩溃/卡顿调用栈摘要到 dayu.media;不发送素材、预设或账号。可随时关闭,保留 30 天。",12,NSFontWeightRegular,DYSecondary()),
|
||||
self.reportID,self.diagnosticDetail,self.sendSummaryButton],NSUserInterfaceLayoutOrientationVertical,10));
|
||||
NSStackView *beta=DYStack(@[updateCard,diagnosticCard],NSUserInterfaceLayoutOrientationHorizontal,14);
|
||||
[updateCard.heightAnchor constraintEqualToAnchor:diagnosticCard.heightAnchor].active=YES;
|
||||
@@ -326,7 +331,7 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
- (void)checkRegistration:(id)sender {
|
||||
if (self.integrityRejected) return;
|
||||
if (self.diagnostics && (self.registrationState == DYChecking || self.registrationState == DYRegistering)) return;
|
||||
[self.exitTimer invalidate]; self.exitTimer = nil; self.registrationState = DYChecking;
|
||||
self.registrationState = DYChecking;
|
||||
self.retryButton.enabled = NO; self.retryButton.title = @"检查中…";
|
||||
self.statusTitle.stringValue = @"正在检查插件…"; self.statusTitle.textColor = NSColor.whiteColor;
|
||||
self.statusDetail.stringValue = @"正在检查本机插件登记,随后自动提交注册。";
|
||||
@@ -400,17 +405,25 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
NSAccessibilityPostNotificationWithUserInfo(self.window,NSAccessibilityAnnouncementRequestedNotification,
|
||||
@{NSAccessibilityAnnouncementKey:self.statusTitle.stringValue,NSAccessibilityPriorityKey:@(NSAccessibilityPriorityHigh)});
|
||||
DYBetaEvent(@"registration",@{@"status":success?@"registered":@"failed"});
|
||||
if(success)[self maybeStartCountdown];
|
||||
if(success)[self refreshBackgroundState];
|
||||
else self.exitDetail.stringValue=@"注册尚未完成,应用会保留此窗口以便重试。";
|
||||
}
|
||||
- (void)maybeStartCountdown {
|
||||
if(self.terminating || self.registrationState!=DYReady)return;
|
||||
if(self.keepOpen){self.exitDetail.stringValue=@"插件已就绪。关闭此窗口后,可继续在宿主中使用。";return;}
|
||||
if(!self.updateCheckDone){self.exitDetail.stringValue=@"注册成功,正在检查公测更新…";return;}
|
||||
if(self.exitTimer)return;
|
||||
self.secondsRemaining=3;[self updateCountdown];
|
||||
self.exitTimer=[NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(exitTick:) userInfo:nil repeats:YES];
|
||||
- (void)refreshBackgroundState {
|
||||
if(self.registrationState==DYReady)self.exitDetail.stringValue=DYBetaEnabled()?@"后台诊断已开启。关闭窗口后继续运行,可从菜单栏重新打开或退出。":@"诊断已关闭。应用保持运行,可从菜单栏退出。";
|
||||
}
|
||||
- (void)buildStatusItem {
|
||||
self.statusItem=[NSStatusBar.systemStatusBar statusItemWithLength:NSVariableStatusItemLength];
|
||||
self.statusItem.button.image=[NSImage imageWithSystemSymbolName:@"slider.horizontal.3" accessibilityDescription:@"大鱼调色后台诊断"];
|
||||
self.statusItem.button.toolTip=@"大鱼调色 · 后台运行";
|
||||
NSMenu *menu=[[[NSMenu alloc]initWithTitle:@"大鱼调色"]autorelease];
|
||||
NSMenuItem *show=[menu addItemWithTitle:@"打开大鱼调色" action:@selector(showMainWindow:) keyEquivalent:@""];show.target=self;
|
||||
NSMenuItem *send=[menu addItemWithTitle:@"发送诊断摘要" action:@selector(sendSummary:) keyEquivalent:@""];send.target=self;
|
||||
[menu addItem:NSMenuItem.separatorItem];
|
||||
NSMenuItem *quit=[menu addItemWithTitle:@"退出大鱼调色" action:@selector(terminate:) keyEquivalent:@""];quit.target=NSApp;
|
||||
self.statusItem.menu=menu;
|
||||
}
|
||||
- (void)showMainWindow:(id)sender { [self.window makeKeyAndOrderFront:nil];[NSApp activateIgnoringOtherApps:YES]; }
|
||||
- (BOOL)applicationShouldHandleReopen:(NSApplication *)app hasVisibleWindows:(BOOL)visible { if(!visible)[self showMainWindow:nil];return YES; }
|
||||
- (void)updateChanged:(NSDictionary *)state {
|
||||
if(self.terminating)return;
|
||||
NSString *phase=state[@"phase"];
|
||||
@@ -425,10 +438,12 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
self.updateInstallButton.enabled=[@[@"available",@"ready",@"host_wait",@"installer"]containsObject:phase];
|
||||
self.updateInstallButton.title=[phase isEqual:@"available"]?@"下载更新":@"安装更新";
|
||||
self.updateCancelButton.hidden=![phase isEqual:@"downloading"];
|
||||
[self.updateProgressTimer invalidate];self.updateProgressTimer=nil;
|
||||
if([phase isEqual:@"downloading"])self.updateProgressTimer=[NSTimer scheduledTimerWithTimeInterval:.5 target:self selector:@selector(refreshUpdateProgress:) userInfo:nil repeats:YES];
|
||||
self.updateProgress.indeterminate=[@[@"checking",@"validating"]containsObject:phase];
|
||||
if(self.updateProgress.indeterminate)[self.updateProgress startAnimation:nil];else [self.updateProgress stopAnimation:nil];
|
||||
self.updateProgress.doubleValue=[@[@"ready",@"host_wait",@"installer"]containsObject:phase]?1:0;
|
||||
[self maybeStartCountdown];
|
||||
[self refreshBackgroundState];
|
||||
}
|
||||
- (void)refreshUpdateProgress:(NSTimer *)timer {
|
||||
if([self.updater.state[@"phase"]isEqual:@"downloading"])self.updateProgress.doubleValue=self.updater.downloadFraction;
|
||||
@@ -441,7 +456,7 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
- (void)cancelUpdate:(id)sender { [self keepIntroduction:nil];[self.updater cancel]; }
|
||||
- (void)refreshDiagnostics:(NSNotification *)note {
|
||||
NSDictionary *state=DYBetaStatus();BOOL enabled=DYBetaEnabled();self.diagnosticToggle.state=enabled?NSControlStateValueOn:NSControlStateValueOff;
|
||||
self.sendSummaryButton.enabled=enabled;
|
||||
self.sendSummaryButton.enabled=enabled; [self refreshBackgroundState];
|
||||
self.reportID.stringValue=[NSString stringWithFormat:@"报告标识:%@",state[@"installation_id"]?:@"准备中…"];
|
||||
NSNumber *uploaded=state[@"last_upload"];
|
||||
if(!enabled)self.diagnosticDetail.stringValue=@"诊断已关闭。不会继续上传,待发送摘要已清除。";
|
||||
@@ -451,23 +466,14 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
}
|
||||
- (void)toggleDiagnostics:(id)sender { [self keepIntroduction:nil];DYBetaSetEnabled(self.diagnosticToggle.state==NSControlStateValueOn);[self refreshDiagnostics:nil]; }
|
||||
- (void)sendSummary:(id)sender { [self keepIntroduction:nil];DYBetaSendSummary();self.diagnosticDetail.stringValue=@"已加入后台发送队列,送达后会显示时间。"; }
|
||||
- (void)updateCountdown { self.exitDetail.stringValue = [NSString stringWithFormat:@"%ld 秒后自动退出\n点击“查看功能介绍”可保留窗口",(long)self.secondsRemaining]; }
|
||||
- (void)exitTick:(NSTimer *)timer {
|
||||
if (--self.secondsRemaining <= 0) {
|
||||
[timer invalidate]; self.exitTimer = nil; self.diagnostics[@"terminationReason"] = @"registration-succeeded"; [self writeDiagnostics]; [NSApp terminate:nil];
|
||||
} else [self updateCountdown];
|
||||
}
|
||||
- (void)keepIntroduction:(id)sender {
|
||||
self.keepOpen = YES; [self.exitTimer invalidate]; self.exitTimer = nil;
|
||||
self.keepButton.title = @"正在浏览介绍"; self.keepButton.enabled = NO;
|
||||
self.exitDetail.stringValue = @"已保留功能介绍窗口。插件可独立在宿主中使用。";
|
||||
[self showMainWindow:sender]; [self refreshBackgroundState];
|
||||
}
|
||||
- (void)confirmHost:(id)sender {
|
||||
if (self.registrationState != DYReady) return;
|
||||
DYBetaEvent(@"host_confirmed",@{@"status":@"user_confirmed"});
|
||||
self.diagnostics[@"hostVerification"] = @"user-confirmed";
|
||||
self.diagnostics[@"terminationReason"] = @"user-confirmed-host";
|
||||
[self writeDiagnostics]; [NSApp terminate:nil];
|
||||
[self writeDiagnostics]; [self.window orderOut:nil];
|
||||
}
|
||||
- (void)writeDiagnostics {
|
||||
NSURL *base = [NSFileManager.defaultManager URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask].firstObject;
|
||||
@@ -493,13 +499,14 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
|
||||
}
|
||||
- (void)closeWindow:(id)sender { [self.window performClose:sender]; }
|
||||
- (void)accessibilityChanged:(NSNotification *)note { [self.window.contentView setNeedsDisplay:YES]; }
|
||||
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)app { return YES; }
|
||||
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)app { return NO; }
|
||||
- (void)applicationWillTerminate:(NSNotification *)note {
|
||||
self.terminating = YES; [self.exitTimer invalidate]; self.exitTimer = nil;
|
||||
self.terminating = YES;
|
||||
[NSStatusBar.systemStatusBar removeStatusItem:self.statusItem];
|
||||
self.updater.changed=nil; [self.updater cancel];DYBetaStop();
|
||||
[self.updateProgressTimer invalidate];self.updateProgressTimer=nil;
|
||||
[NSNotificationCenter.defaultCenter removeObserver:self];
|
||||
[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self];
|
||||
}
|
||||
- (void)dealloc { [_exitTimer invalidate]; [_exitTimer release]; [_diagnostics release]; [_updater release]; [_updateProgressTimer invalidate]; [_updateProgressTimer release]; [super dealloc]; }
|
||||
- (void)dealloc { [_statusItem release]; [_diagnostics release]; [_updater release]; [_updateProgressTimer invalidate]; [_updateProgressTimer release]; [super dealloc]; }
|
||||
@end
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.17.1</string>
|
||||
<string>1.18.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>103</string>
|
||||
<string>106</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -4,13 +4,46 @@
|
||||
|
||||
## 当前基线
|
||||
|
||||
**1.17.1(103)已正式安装,PKG 已签名公证,Release 正在上传。** 本轮按用户要求恢复检视器折叠与内部滚动,默认只展开一级调色、基础调整、蜘蛛盘;修复手绘蒙版跨宿主时间起点写回,马赛克改用轻量人脸框检测,并接入多个人脸/蒙版选择。用户要求代码接入后自行实测,真实运动多人、遮挡和流畅度尚未验收。
|
||||
**1.18.1(106)已正式安装并通过宿主验收,安装包与线上发布正在完成。** 实际编译提交 `1cc7f8edb2acb3cfc62bd72447c2956ad7a01601`;APP 公证 `2c4e6cba-8178-4a50-9198-83e66be37add` Accepted。安装后 964 项原生检查通过,FCP 独立副本完成两轮 285 帧跟踪及模块/参数交互。
|
||||
|
||||
- 跟踪保留 OpenCV LK,Metal 灰度回读减少 75%,目标区域特征检测与金字塔复用减少 CPU 工作。同一 4K 片段算法计算 8.78 秒降至 1.31 秒(约 6.72 倍),轨迹逐帧一致;不含宿主供图、解码、预览与渲染,不等于全流程速度。
|
||||
- 界面减少完整参数重建、重复宿主读取及图层列表重建。未测 UI 延迟分位数,不宣称所有界面卡顿已根治。
|
||||
- 人脸转身仍有偏移,原版在同一离线输入上也存在;当前优化未改进精度。旧 Metal LK 实验在第 133 帧丢轨,已拒收,没有启用到正式路径。
|
||||
- 证据:[性能](verification/TrackingPerformance1.18.1.json) · [宿主验收范围](verification/HostTrackingUI1.18.1.json) · [实现与限制](research/TrackingMetal1.18.1.md)。继续处理时优先关注交互流畅与转身/遮挡精度,避免把渲染平均耗时当作 UI 延迟。
|
||||
|
||||
## 1.18.0 交付基线(历史)
|
||||
|
||||
**1.18.0(105)已正式安装、发布 Git Release,并上线主 APP 公测更新通道。** 本轮完成云端报告调查、取消主 APP 自动退出、增强可关闭的后台诊断。已验证真实卡顿调用栈到达云端;已有用户卡顿的具体算法根因仍待继续分析,不能宣称已根治。
|
||||
|
||||
| 项目 | 已核对状态 |
|
||||
| --- | --- |
|
||||
| 工程与源码 | `/Volumes/备份/大鱼调色/大鱼调色`,`main`,远程 `https://dayu.media/git/dayu/dayu-color.git`。实际编译 **`d0187695581fa3a8fe5c3cfa8a1bc6337425f5f6`**;发行标签 `v1.18.0-diagnostics-20261106` 指向 **`a03a056bff17daadce77128f767a08e98dc830dd`**。原有 project.pbxproj 三处 Security 引用排序保留未提交。 |
|
||||
| 正式安装 | **1.18.0(105)**,`/Library/Plug-Ins/FxPlug/大鱼调色.app`。APP 公证 `5a98cab1-23af-4034-abc9-0c9e7b1dc77d` Accepted,票据、Gatekeeper、唯一 PluginKit 路径通过;961 项原生回归、75 项离线诊断检查、FCP 12.4 加载及播放验收完成。[交付](verification/Delivery.json) · [实际范围](verification/Diagnostics1.18.0.json) |
|
||||
| Git Release | Release **401**,PKG 附件 **45**(46,620,783 字节,SHA-256 `4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f`),匹配 dSYM 附件 **46**。两附件均在草稿及发布后完整下载核验;保留公测标记及原仓库可见性。[发行页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.18.0-diagnostics-20261106) · [发布记录](verification/Release1.18.0.json) · [符号](verification/Symbols1.18.0.json) |
|
||||
| 云端诊断后端 | 仅更新 `wp-content/mu-plugins/dayu-color-beta.php`;生产旁路备份 `dayu-color-beta-202611061649.phpbak`,增加限定字段并分开展示上传版本/故障版本。27 项合同检查及线上 ACK/重试/隔离核验通过。[部署](verification/BetaBackendDeployment.json) · [线上检查](verification/BetaBackendLive.json) |
|
||||
| 更新通道与文章 | 主 APP beta 通道已从 1.12.0(79)更新到 **1.18.0(105)**,清单旁路备份 `beta-202611061726.jsonbak`;线上 PKG 完整下载大小与 SHA-256 一致,95 收到更新、105 不重复提示。文章 15792 已更新 **1.18.0(105)** 主下载、标题、SEO、自动诊断说明和 16 个独立效果查找位置;价格、会员规则与封面保留,全文及正式下载验票/哈希通过。[文章验证](verification/Article1.18.0.json)。[更新验证](verification/BetaPublication1.18.0.json) |
|
||||
| 包与清理 | PKG 公证 `8c4fa3f6-4866-429a-8750-8567f7db4766` Accepted;票据、Gatekeeper、20 项展开、198 条载荷权限检查及常驻主 APP 正常退出规则通过。本机从正式 APP 独立验收,未再次运行 PKG 系统安装脚本。当前正式包与符号 ZIP 位于项目上级“发行包”;本轮临时 APP/旧替换备份/采样原文/下载副本/恢复 clone 已清理。[验包](verification/Package.json) · [清理](verification/Cleanup1.18.0.json) |
|
||||
|
||||
## 1.18.0:报告结论、后台采集与待跟进
|
||||
|
||||
- **历史闪退**:云端 43 条崩溃摘要中 7 条属于本机开发测试;外部 36 条中 34 条是 1.10.0 通知回调对象生命周期故障,1.11.0 起的既有提交 `1c3e294ce991b0205969486c330dba57714aeacc` 已修复。上传版本 1.14.x 不等于崩溃实际版本。两条 1.7.4 dyld 旧摘要不足以判定原因。完整脱敏分析见 [调查记录](research/CloudDiagnostics1.18.0.md)。
|
||||
- **常驻与采集**:取消注册后的倒计时退出;关窗后台运行,菜单栏可重新打开、发送摘要或主动退出。每分钟扫描本产品 APP/XPC 的系统崩溃报告,记录实际版本、终止类别、UUID/偏移,排除 ASAN/原生自检;卡顿探针使用公共运行循环,限频对自身进程采样。渲染、状态构建、检视器、跟踪按分钟汇总,避免每帧上传。只提取允许的摘要,不传素材、LUT、预设、账号或原始系统报告,沿用诊断开关与 30 天保留。
|
||||
- **正式实测**:候选 104 的采样首次超时,未分发;105 移除采样前的符号预读并给后台解析 30 秒上限。受控 12 秒主 APP 卡顿已在云端捕获 `runDiagnosticsProbe → sleepForTimeInterval → nanosleep`,标记 verification。关闭诊断超过一分钟,待发清零且无新增上报;恢复原开启状态后主 APP 与 XPC 恢复发送。关窗后同一普通进程持续跨两轮分钟统计,不含测试启动参数;这是短时实测,不是长期压力测试。
|
||||
- **已经得到的新性能线索**:当前 3840×2160 素材的 28 次渲染平均 **601.4 ms**、最大 **1716.8 ms**;同期 41 次状态构建平均 **4.31 ms**、最大 **8.68 ms**。主要耗时落在渲染阶段,尚未细分到 GPU 等待、读回、具体算法或资源竞争,也不能直接换算为播放 FPS。本轮只建立诊断证据,没有顺带重写渲染器。
|
||||
- **刚才疑似本机闪退**:17:03/17:06 与本轮 Cmd-Q 退出时间一致,系统 `(0,0,0)`,无新增 FCP 崩溃报告;用户已确认可能为本轮正常退出。另有今天 10:30 的历史 FCP ProOSC 绘制中止、主线程重建检视器,报告不含大鱼栈,不能归因到本插件或此次诊断。[退出核对](verification/LocalHostExit1.18.0.json)。本产品自动上传范围不包含其他 APP 的完整崩溃报告;若 FCP 自身再次崩溃,仍需对应宿主 IPS 与插件时间线关联。
|
||||
- **恢复**:实际编译节点 724 个文件、发行标签 728 个文件独立远端检出并逐字节核对,Git 完整性通过;无 LFS/子模块,未重复第三方冷构建。符号 ZIP 与主 APP/XPC 二进制 UUID 精确匹配,已随 Release 保存。[恢复记录](verification/Recovery1.18.0.json) · [恢复步骤](RECOVERY.md)。
|
||||
|
||||
用户最新优先级(2026-11-06):先完成文章自动收集版更新(已完成),随后优先保证界面操作流畅;普通渲染速度可暂缓。新增要求:尝试用 Metal 加速马赛克跟踪。接手先核对 1.18.0(105)和新云端事件,区分 UI 主线程、逐帧供图、追踪算法、预览更新的耗时。处理用户崩溃时按 source_version/source_build 和 UUID 匹配符号,不用上传版本推断故障版本。以下为前序交付记录。
|
||||
|
||||
## 1.17.1 交付时基线(历史)
|
||||
|
||||
**1.17.1(103)已正式安装并完成 Git Release 交付。** 本轮按用户要求恢复检视器折叠与内部滚动,默认只展开一级调色、基础调整、蜘蛛盘;修复手绘蒙版跨宿主时间起点写回,马赛克改用轻量人脸框检测,并接入多个人脸/蒙版选择。用户要求代码接入后自行实测,真实运动多人、遮挡和流畅度尚未验收。
|
||||
|
||||
| 项目 | 已核对状态 |
|
||||
| --- | --- |
|
||||
| 工程与源码 | `/Volumes/备份/大鱼调色/大鱼调色`,`Wrapper Application` / Release;远程 `https://dayu.media/git/dayu/dayu-color.git`,`main`。实际编译提交 **`3b4c612edf99c0ef2b972b7305cd7ba44244a7c6`**。 |
|
||||
| 本机正式安装 | **1.17.1(103)**,`/Library/Plug-Ins/FxPlug/大鱼调色.app`。Developer ID 签名、APP 公证 `36ecb7e6-5cfc-4b85-8363-11272d880b18` Accepted、票据、Gatekeeper、唯一 PluginKit 路径、961 项原生自检及 FCP 12.4 加载/折叠滚动/菜单验证通过。[交付](verification/Delivery.json) · [宿主范围](verification/HostInspectorMosaic1.17.1.json) |
|
||||
| Git Release | `大鱼调色-1.17.1.pkg`,46,600,407 字节,SHA-256 `5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710`。20 项展开验包、198 条权限检查、PKG 公证 Accepted 和票据通过;Release 上传准备中。上一版 Release 保留。 |
|
||||
| Git Release | `大鱼调色-1.17.1.pkg`,46,600,407 字节,SHA-256 `5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710`。标签 `v1.17.1-inspector-mosaic-20261106` 指向 **`7c0bfa5352f282bcec0aedf43be29af4432f2ba8`**。Release **400**/附件 **44** 已发布,保留公测标记与仓库可见性;草稿及发布后完整下载大小与哈希一致。[发行页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.17.1-inspector-mosaic-20261106) · [发布记录](verification/Release.json) · [验包](verification/Package.json) |
|
||||
| 站点及自动更新 | 本轮未操作。原文章 15792 主下载上次核对为 **1.14.4(95)**;主 APP 公测更新通道上次回读为 **1.12.0(79)**。[原文章](https://dayu.media/15792/) · [文章核验](verification/Article1.14.4.json) · [更新通道核验](verification/BetaPublication1.12.0.json) |
|
||||
| 环境与验收库 | Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+、FCP 12.4。固定缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。QA 库 `fcp-qa/level-1.15.0/未命名.fcpbundle`,事件“大鱼调色1.17.0全链路与马赛克验收”。接手重新检查产品交付锁。 |
|
||||
|
||||
@@ -21,7 +54,8 @@
|
||||
- 全部人脸模式改用长边 640 的 Vision 人脸框检测,独立同画面缓存,减少特征点开销。肤色保护原算法保留;本次没有同场景前后播放帧率基准,不能保证所有素材流畅。
|
||||
- 指定目标入口:开启“全部人脸 · 快速逐帧识别”→ 暂停目标画面 → 再开“局部马赛克”→“将本帧 N 张人脸转为可选跟踪蒙版”→ 勾选需要遮挡的人脸。在控制面板蒙版页逐个运行正向、反向或双向跟踪。每个框有稳定 UUID;生成后未跟踪前是静态,不是全片身份识别。矩形、椭圆和钢笔也能多选用于马赛克。
|
||||
- 961 项正式原生检查通过;双人测试使用 NASA 公有人像并排合成,取消一人后其像素变化为 0。16 个独立模板与整合模板静态检查通过。FCP 实窗看到初始三组、折叠标题、展开胶片和曲线产生内部滚动、收起后滚动条消失;本帧单人转换入口可用。[专项记录](research/InspectorMosaic1.17.1.md) · [回归](verification/InspectorMosaic1.17.1.json)
|
||||
- 编译节点独立远端恢复 714 个文件逐一校验,无 LFS/子模块;未重复第三方冷构建。原有 project.pbxproj 三处 Security 引用排序保持未提交。[恢复](verification/Recovery1.17.1.json)
|
||||
- 编译节点 714 个文件、发行标签 718 个文件独立远端检出并逐一校验,差异仅为记录与模板模型来源哈希;无 LFS/子模块,未重复第三方冷构建。原有 project.pbxproj 三处 Security 引用排序保持未提交。[恢复](verification/Recovery1.17.1.json)
|
||||
- PKG 公证 `8e122236-9ca6-4d92-ad6a-b9c2411280e7` Accepted,票据、Gatekeeper、20 项展开检查和 198 条载荷权限检查通过;正式 APP 独立安装验收,本机未重复执行 PKG 系统脚本。本轮构建 APP、公证 ZIP、旧替换备份、包暂存、恢复 clone 和草稿下载副本已清理,保留正式包与用户历史包,交付锁已释放。[清理](verification/Cleanup1.17.1.json)
|
||||
|
||||
接手第一步核对 1.17.1(103),按用户实拍反馈复测手绘松手、目标脸选择、轨迹及播放耗时;不要把原生回调测试或静态人像验证当作真实多人运动验收。下方为历史记录。
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户