比较提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
5fe4b1933e | ||
|
|
a4a1f8b08b | ||
|
|
1cc7f8edb2 | ||
|
|
48ac192d4b | ||
|
|
ca4abaf2c3 | ||
|
|
38f15ec1fe | ||
|
|
1575cb1191 |
没有与搜索条件相匹配的文件
+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='公测诊断增强:主 APP 关闭窗口后保持后台运行;自动发送本产品崩溃、卡顿调用栈摘要及阶段耗时,可随时关闭诊断。安装器会提示正常退出 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)
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
}
|
||||
@@ -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。
|
||||
+16
@@ -1,3 +1,19 @@
|
||||
# 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 指针/子模块。发行标签 **`v1.17.1-inspector-mosaic-20261106`** 指向 **`7c0bfa5352f282bcec0aedf43be29af4432f2ba8`**,独立检出核对 718 个文件;差异仅为交付记录与模板模型来源哈希,编译输入一致。[恢复核验](verification/Recovery1.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;
|
||||
}
|
||||
@@ -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,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 @@
|
||||
{
|
||||
"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.18.0",
|
||||
"build": "105",
|
||||
"version": "1.18.1",
|
||||
"build": "106",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "5a98cab1-23af-4034-abc9-0c9e7b1dc77d",
|
||||
"notaryID": "2c4e6cba-8178-4a50-9198-83e66be37add",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "d0187695581fa3a8fe5c3cfa8a1bc6337425f5f6",
|
||||
"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/Diagnostics1.18.0.json"
|
||||
"shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793",
|
||||
"hostVerification": "verification/HostTrackingUI1.18.1.json"
|
||||
}
|
||||
@@ -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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4"
|
||||
"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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/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": 118.30725002801046,
|
||||
"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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/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": "CB75309D-6F1B-4BFC-873F-5C2D7525FF7A",
|
||||
"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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4",
|
||||
"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,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
|
||||
}
|
||||
}
|
||||
+16
-16
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.18.0.pkg",
|
||||
"sha256": "4a52742a393ecaaa30f758d72c9e0ba68c606ed8e805316d48b9868068378a3f",
|
||||
"bytes": 46620783,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.18.1.pkg",
|
||||
"sha256": "e149555c46cc6196eb12601196d70121d79b796be852f9a2e89688b20483a6b2",
|
||||
"bytes": 46654687,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
@@ -31,27 +31,27 @@
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.18.0",
|
||||
"build": "105"
|
||||
"version": "1.18.1",
|
||||
"build": "106"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-eqipkz7y/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.8b6fe9d5-0d23-4953-a3b8-a668fdf704ee/0ED2AA69-F1AC-4FC5-BFE1-C5D58E384F6C/大鱼调色"
|
||||
"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.18.0.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 09:23:02 +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.0.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.18.0.pkg",
|
||||
"message": "Successfully received submission info",
|
||||
"id": "5b0f2573-e603-49a5-91b6-fa0582c8c782",
|
||||
"status": "Accepted",
|
||||
"id": "8c4fa3f6-4866-429a-8750-8567f7db4766",
|
||||
"createdDate": "2026-11-06T09:23:04.653Z",
|
||||
"message": "Successfully received submission info"
|
||||
"createdDate": "2026-11-06T10:16:44.681Z",
|
||||
"name": "大鱼调色-1.18.1.pkg"
|
||||
},
|
||||
"appCompiledSource": "d0187695581fa3a8fe5c3cfa8a1bc6337425f5f6",
|
||||
"appBuild": "105",
|
||||
"appCompiledSource": "1cc7f8edb2acb3cfc62bd72447c2956ad7a01601",
|
||||
"appBuild": "106",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"residentAppClosing": {
|
||||
"identifiers": [
|
||||
@@ -127,6 +127,6 @@
|
||||
"entries": 198,
|
||||
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/Diagnostics1.18.0.json",
|
||||
"installedAppHostAcceptance": "verification/HostTrackingUI1.18.1.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -6,6 +6,11 @@
|
||||
"lfs": "no LFS pointers",
|
||||
"submodules": "none",
|
||||
"scope": "Independent remote clone, exact committed file bytes; third-party cold build not repeated",
|
||||
"releaseTag": "pending",
|
||||
"sourceByteComparison": "passed"
|
||||
"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"
|
||||
}
|
||||
+37
-16
@@ -1,22 +1,43 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.17.1-inspector-mosaic-20261106",
|
||||
"releaseCommit": "7c0bfa5352f282bcec0aedf43be29af4432f2ba8",
|
||||
"releaseID": 400,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.17.1-inspector-mosaic-20261106",
|
||||
"assetID": 44,
|
||||
"assetName": "大鱼调色-1.17.1.pkg",
|
||||
"downloadURL": "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",
|
||||
"bytes": 46600407,
|
||||
"sha256": "5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"prerelease": true,
|
||||
"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,
|
||||
"draftVerification": "verification/DraftDownload1.17.1.json",
|
||||
"releaseClassification": "Retains the product public-beta classification used by previous release 399; app update channel unchanged."
|
||||
"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,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"
|
||||
}
|
||||
@@ -18,5 +18,9 @@
|
||||
"path": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.18.0-symbols.zip",
|
||||
"bytes": 3562272,
|
||||
"sha256": "a5bf3a6cc836c5da0471d9a70d2eb9e81a5166c63bbfae993a910ba859936c9c",
|
||||
"remoteStatus": "pending"
|
||||
"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"];
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -238,8 +238,8 @@
|
||||
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){
|
||||
|
||||
+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.18.0</string>
|
||||
<string>1.18.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>105</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.18.0</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_;
|
||||
}
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.18.0</string>
|
||||
<string>1.18.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>105</string>
|
||||
<string>106</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -4,6 +4,39 @@
|
||||
|
||||
## 当前基线
|
||||
|
||||
**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 交付。** 本轮按用户要求恢复检视器折叠与内部滚动,默认只展开一级调色、基础调整、蜘蛛盘;修复手绘蒙版跨宿主时间起点写回,马赛克改用轻量人脸框检测,并接入多个人脸/蒙版选择。用户要求代码接入后自行实测,真实运动多人、遮挡和流畅度尚未验收。
|
||||
|
||||
| 项目 | 已核对状态 |
|
||||
|
||||
在新工单中引用
屏蔽一个用户