比较提交

...
作者 SHA1 备注 提交日期
mac b85165b6e2 Record the verified Dayu Color 1.15.0 app, host checks and installer 2026-11-06 11:47:27 +08:00
mac a2a6e57c13 Cover the seventh canvas tool and handle FCP callback timing 2026-11-06 11:33:06 +08:00
mac 320f4c5f91 Initialize the canvas geometry as an Objective-C++ instance member 2026-11-06 11:30:41 +08:00
mac 5ca307414c Add dark defaults, modular effect templates and canvas leveling 2026-11-06 11:29:52 +08:00
mac ffabdca5b1 Record Dayu site article 15792 update and verified 1.14.4 download 2026-11-06 10:54:27 +08:00
mac c9c72afc5b Verify published Dayu Color 1.14.4 downloads and complete handoff 2026-11-06 10:49:32 +08:00
mac a7926f7e13 Record verified Dayu Color 1.14.4 app and installer 2026-11-06 10:46:37 +08:00
mac 474bff9ea9 Normalize bundled resource permissions and gate Installer payload modes 2026-11-06 10:43:03 +08:00
mac 9f5f065977 Limit launch integrity checks to signed Dayu Color executables 2026-11-06 10:33:18 +08:00
mac 14afd3382c Publish Dayu Color 1.14.3 article and verify screenshot, cover and installer 2026-11-06 02:54:24 +08:00
mac 48f48cb90c Verify published 1.14.3 installer and document tracking handoff 2026-11-06 02:09:32 +08:00
mac 8b96e8b8c1 Record notarized 1.14.3 installation and tracking acceptance 2026-11-06 02:07:10 +08:00
mac 6515e0fa67 Draw tracking progress directly from the completed frame count 2026-11-06 02:00:41 +08:00
mac d2b6f8ef81 Keep tracking preview inside its frame and clear results when switching masks 2026-11-06 01:52:57 +08:00
mac 687a366e1c Show synchronized frame previews and progress for stamp and mask tracking 2026-11-06 01:45:18 +08:00
mac 7b6a3106ca Stabilize clone stamp tracks and sample fractional motion continuously 2026-11-06 01:30:28 +08:00
mac 89eeaa9ba1 Verify published 1.14.0 release download and complete recovery records 2026-11-06 00:46:46 +08:00
mac c86925d967 Record notarized 1.14.0 installer and release inputs 2026-11-06 00:44:47 +08:00
mac 7e11c47126 Verify installed 1.14.0 dual tracking on the original FCP footage 2026-11-06 00:42:20 +08:00
mac 810bbf4dfb Replace legacy automatic stamp keys on the same host analysis frame 2026-11-06 00:34:23 +08:00
mac 52a7422004 Track both clone stamp regions and render their relative zoom 2026-11-06 00:21:58 +08:00
mac 78b4c5f962 Record installed 1.13.4 and user-confirmed clone stamp editing 2026-11-06 00:16:45 +08:00
mac 7bf1f88fe9 Persist clone stamp edits using the host action time 2026-11-06 00:01:33 +08:00
mac b2601ac9b0 Retain clone regression fixtures across asynchronous writes 2026-11-05 23:53:30 +08:00
mac 5032ce70ab Keep clone stamp preview through host save and use the action clock 2026-11-05 23:51:06 +08:00
mac df9b3c0253 Verify published Dayu Color 1.13.2 article and installer 2026-11-05 23:33:03 +08:00
mac 44c4f5c470 Prepare Dayu Color 1.13.2 article update 2026-11-05 23:30:41 +08:00
mac 84a0405628 Verify published Dayu Color 1.13.2 installer download 2026-11-05 23:19:20 +08:00
mac 5252296b7b Record verified Dayu Color 1.13.2 integrity delivery 2026-11-05 23:16:30 +08:00
mac db6b2b05b3 Reject modified Dayu Color bundles at registration, service startup and update 2026-11-05 23:06:15 +08:00
mac a7508203d1 Record Dayu Color re-signing protection assessment 2026-11-05 22:55:59 +08:00
mac 38afc087d5 Verify and record published 1.13.1 pixel clone installer 2026-11-05 22:34:12 +08:00
mac 46153a26ed Record signed pixel clone build and Final Cut Pro validation 2026-11-05 22:31:22 +08:00
mac 1659f3d385 Clone original pixels by translation and keep the tracked footprint stable 2026-11-05 22:21:25 +08:00
mac dff9134be7 Keep the clone identity through the host test document replacement 2026-11-05 22:12:43 +08:00
mac 1f1b7917e7 Make the clone source crosshair draggable without changing target tracks 2026-11-05 22:09:33 +08:00
mac 4fb008e100 Verify and record published 1.13.0 installer 2026-11-05 22:08:05 +08:00
共修改 79 个文件,包含 4506 行新增和 274 行删除

没有与搜索条件相匹配的文件

+52 -13
查看文件
@@ -8,9 +8,14 @@ import os
from pathlib import Path
import plistlib
import shutil
import stat
import subprocess
import tempfile
import sys
ROOT = Path(__file__).resolve().parent.parent
sys.path.insert(0, str(ROOT / "tools"))
from template_payload import template_files
APP = Path("/Library/Plug-Ins/FxPlug/大鱼调色.app")
CACHE = Path.home() / "Library/Caches/CodexBuilds/com.dayu.color"
LOCK = Path.home() / ".codex/app-delivery-locks/com.dayu.color.lock"
@@ -25,6 +30,33 @@ def history(profile, keychain):
"--keychain", keychain, "--output-format", "json"))["history"]
def check_bundle_access(entries):
for path, mode in entries:
if stat.S_ISLNK(mode):
continue
required = 0o555 if stat.S_ISDIR(mode) or mode & stat.S_IXUSR else 0o444
if mode & required != required:
raise ValueError(f"普通用户无法读取或执行安装载荷:{path}({stat.S_IMODE(mode):04o})")
def check_package_bundle_access(package):
prefix = "." + str(APP)
with tempfile.TemporaryDirectory(dir=CACHE) as scratch:
expanded = Path(scratch) / "expanded"
run("pkgutil", "--expand", str(package), str(expanded))
entries = {}
for bom in expanded.glob("*.pkg/Bom"):
for line in run("lsbom", "-p", "fm", str(bom)).splitlines():
path, mode = line.rsplit("\t", 1)
if path == prefix or path.startswith(prefix + "/"):
if not any(part.startswith("._") for part in Path(path).parts):
entries[path] = int(mode, 8)
if prefix not in entries:
raise ValueError(f"安装载荷清单缺少正式 APP:{APP}")
check_bundle_access(entries.items())
return len(entries)
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument("--pkg-forge-repo", type=Path,
@@ -50,30 +82,31 @@ def main():
LOCK.mkdir()
(LOCK / "owner.json").write_text(json.dumps(dict(PID=os.getpid(), cwd=str(ROOT),
product="大鱼调色", phase="PKG packaging", started=datetime.datetime.now(datetime.timezone.utc).isoformat())))
stage = None
try:
check_bundle_access((path, path.lstat().st_mode) for path in [APP, *APP.rglob("*")])
source = APP / "Contents/Resources/FCP Templates"
staged = CACHE / "pkg-inputs/大鱼调色/大鱼调色"
staged.mkdir(parents=True, exist_ok=True)
# Use a fresh staging directory, so historical files cannot leak into
# the new payload or override the intended effect list.
stage = Path(tempfile.mkdtemp(prefix="pkg-inputs-", dir=CACHE))
staged = stage / "大鱼调色"
hashes = {}
for name in ["大鱼调色.moef", "large.png", "small.png"]:
data = (source / name).read_bytes()
assert data == (ROOT / "template" / name).read_bytes(), name
target = staged / name
if target.exists():
os.chflags(target, 0)
for reference, bundled, installed in template_files():
data = (source / bundled).read_bytes()
assert data == (ROOT / "template" / reference).read_bytes(), installed
target = staged / installed
target.parent.mkdir(parents=True, exist_ok=True)
target.write_bytes(data)
target.chmod(0o644)
if name.endswith(".png"):
if target.suffix == ".png":
os.chflags(target, 2)
hashes[name] = hashlib.sha256(data).hexdigest()
for folder in [staged, staged.parent]:
folder.chmod(0o755)
hashes[str(installed)] = hashlib.sha256(data).hexdigest()
keychain = str(Path.home() / "Library/Keychains/login.keychain-db")
profile = "codex-dayu-notary-B3W25FX5H5"
version = info["CFBundleShortVersionString"]
manifest = dict(name="大鱼调色", output=str(args.output_dir / "大鱼调色.pkg"),
identifierPrefix="com.dayu.color.installer", resources=[dict(source=str(APP)),
dict(source=str(staged.parent), destination="~/Movies/Motion Templates.localized/Effects.localized")],
dict(source=str(staged), destination="~/Movies/Motion Templates.localized/Effects.localized")],
signing=dict(identity="Developer ID Installer: zhong luo (B3W25FX5H5)", profile=profile,
keychain=keychain, notaryKeychain=keychain),
appearance=dict(title="大鱼调色", subtitle="适用于 Final Cut Pro 与 Motion 的原生调色效果",
@@ -93,6 +126,7 @@ def main():
with log_path.open("w") as log:
subprocess.run(command, stdout=log, stderr=subprocess.STDOUT, check=True)
package = args.output_dir / ("大鱼调色-" + version + ".pkg")
verified_payload_entries = check_package_bundle_access(package)
report_path = ROOT / "verification/Package.json"
subprocess.run(["/usr/bin/python3", str(skill / "verify_fxplug_package.py"), "--manifest", str(manifest_path),
"--package", str(package), "--report", str(report_path)], check=True)
@@ -105,11 +139,16 @@ def main():
report.update(notarization=job, appCompiledSource=delivery["sourceCommit"], appBuild=info["CFBundleVersion"],
packageBuilderRemote="https://dayu.media/git/dayu/pkg-forge.git",
packageBuilderCommit=run("git", "rev-parse", "HEAD", cwd=forge), templateSHA256=hashes,
payloadBundleAccess=dict(entries=verified_payload_entries, scope="Read/traverse modes for installer-owned app entries, from the package BOM"),
installedAppHostAcceptance=delivery.get("hostVerification", "verification/HostLUTLoading.json"),
installScope="本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。")
report_path.write_text(json.dumps(report, ensure_ascii=False, indent=2) + "\n")
print("正式安装包:" + str(package))
finally:
if stage and not args.prepare_only:
for preview in stage.rglob("*.png"):
os.chflags(preview, 0)
shutil.rmtree(stage)
(LOCK / "owner.json").unlink()
LOCK.rmdir()
+9
查看文件
@@ -0,0 +1,9 @@
## 大鱼调色 1.13.1(85)
选中仿制图章后,可拖动青色取样十字来调整取样位置。松手后重新取样并保存为一次撤销,按 Esc 可取消拖动。覆盖区域及已有位置轨迹随项目保留。
图章按 1:1 像素平移复制。改变椭圆宽高只改变覆盖范围,跟踪只移动目标中心。原画面的像素尺寸和方向保持一致。
本公测版本适用于 Apple Silicon Mac,要求 macOS 14.6 或更高版本。
安装包 SHA-256 `8a19afadda6317d186541f37a221c46261a22ddabcdddec90d02e1315b693965`,45,352,349 字节。
+19
查看文件
@@ -0,0 +1,19 @@
{
"title": "大鱼调色 1.13.2 公测版|安装完整性校验与仿制图章",
"content": "<!-- wp:paragraph -->\n<p>大鱼调色是适用于 Final Cut Pro 和 Motion 的原生 FxPlug 4 调色插件。1.13.2 公测版新增安装完整性校验,并包含近期加入的仿制图章。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.13.2 安装完整性校验</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p>主 App 注册插件前会检查官方签名和文件完整性。如果检测到掉签、重签或安装内容被修改,主 App 会停止自动更新,并尝试撤销当前副本的插件登记。Final Cut Pro 或 Motion 启动插件服务时,还会再做一次验签。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>官方原始 PKG 可以原样转发。</strong> 请保持安装包原样。禁止二次加密、另加一机一码后分发。大鱼调色安装和使用无需登录、激活码或机器码。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">仿制图章</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p>在画布右下角选择仿制图章,点选取样中心并拖出覆盖区。选中图章后,可以拖动青色十字重新取样,松手后可一次撤销,按 Esc 可取消拖动。图章按原像素平移复制,扩大覆盖区时,已有重合区域的复制像素保持一致。</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,颗粒、晕光、蒙版等时间或空间效果不属于静态 LUT 的保存范围。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>胶片模拟与印片外观</strong>:包含减色、颗粒、晕光、辉光、暗角及通道混合器,提供 Kodak 2383、Fuji 3513 等八种印片外观,可独立调整强度。</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\">历史更新</h2>\n<!-- /wp:heading -->\n\n<!-- wp:heading {\"level\":3} -->\n<h3 class=\"wp-block-heading\">1.12.0 统一调色工作区与共享蒙版</h3>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>统一调色工作区</strong>。从画布右下角或检视器点击“控制面板”。左侧管理图层,中间调节选中的模块,右侧同时显示亮度波形、RGB 分列、直方图和带肤色参考线的矢量图。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>画布工具与共享蒙版</strong>。左下角可直接绘制矩形、椭圆和钢笔蒙版,也能打开曲线、畸变、肤色范围或 LUT。一个蒙版可同时作用于 HSL、蜘蛛盘等多个图层。点击图层上的蒙版图标即可编辑形状或运行跟踪。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>最近使用 LUT</strong>。风格 LUT 参数下方显示最近使用的缩略图,点击即可应用到当前图层。浏览库按窗口宽度自动换行,保留文件夹和画面预览。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>编辑与加载</strong>。改善切换片段、重新打开检视器及停在片尾时的加载,修正钢笔闭合和画布曲线调整的保存问题。已在本机 Final Cut Pro 验证。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":15856,\"sizeSlug\":\"large\",\"linkDestination\":\"none\"} -->\n<figure class=\"wp-block-image size-large\"><img src=\"https://dayu.media/wp-content/uploads/2026/11/1793866544-78805a221a988e7-1024x298.png\" alt=\"\" class=\"wp-image-15856\"/><figcaption class=\"wp-element-caption\">全新浮窗工作区面板</figcaption></figure>\n<!-- /wp:image -->\n\n<!-- wp:heading {\"level\":3} -->\n<h3 class=\"wp-block-heading\">1.10.0 画布工具与独立工作区</h3>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p>下方为 1.10.0 的深色与浅色界面记录。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":15840,\"sizeSlug\":\"full\",\"linkDestination\":\"none\"} -->\n<figure class=\"wp-block-image size-full\"><img src=\"https://dayu.media/wp-content/uploads/2026/11/1793804584-5bc2fbe021e0e8f.png\" alt=\"大鱼调色 1.10.0 深色模式:画布左侧纵向工具条、检查Line truncated
"excerpt": "大鱼调色 1.13.2 公测版加入安装完整性校验,并包含按原像素复制的仿制图章。原始安装包可以原样转发,安装与使用无需机器码。",
"seo": {
"title": {
"enabled": true,
"value": "大鱼调色 1.13.2 公测版|安装完整性校验与仿制图章"
},
"description": {
"enabled": true,
"value": "大鱼调色 1.13.2 是适用于 Final Cut Pro 与 Motion 的原生调色插件。新版增加安装完整性校验,并包含按原像素复制的仿制图章。官方原始安装包已签名公证,可以原样转发。适用于 Apple Silicon 和 macOS 14.6 或更新版本。"
},
"keywords": {
"enabled": true,
"value": "大鱼调色,Final Cut Pro,Motion,FxPlug4,调色插件,仿制图章,安装完整性校验"
}
}
}
+9
查看文件
@@ -0,0 +1,9 @@
## 大鱼调色 1.13.2(86)
新增安装完整性检查。主 APP 验证外层 APP 和插件服务的官方签名后再提交注册。发现签名失效或安装内容被改动时,主 APP 停止自动更新,撤销当前副本的插件登记。FxPlug 服务在 Final Cut Pro 或 Motion 请求启动时也会独立验签。
原始 PKG 可以原样转发。安装和调色均无需机器码或登录。正常安装的自动更新继续可用,下载的安装包仍经签名、公证和完整性校验。
适用于 Apple Silicon Mac,要求 macOS 14.6 或更高版本。
安装包为 45,359,239 字节,SHA-256 `6c18bc081cd9d5099ae821df5d5da43585f9db292345c18db4a4e12cce1f133f`。
+9
查看文件
@@ -0,0 +1,9 @@
## 大鱼调色 1.14.0(90)
仿制图章现在分别跟踪取样区和覆盖区的位置及缩放。覆盖圈会跟随覆盖区变化,复制内容按两边的相对缩放取样。原有图章可选中后重新执行双向跟踪。任一侧跟丢时,保留两边均可信的连续轨迹。
修复拖出图章后预览消失、拖动后回到原处,以及旧自动轨迹键可能让片尾跳回旧位置的问题。在 Final Cut Pro 12.4 的 4K 实拍素材中验证了 257 个连续双点键。
适用于 Apple Silicon Mac,要求 macOS 14.6 或更高版本。原始签名安装包可以原样转发。
安装包为 45,370,597 字节,SHA-256 `884342ab5ef0c42d873a6411b6c2bf0ae3cec2e07dedda90b308b057ff59f5e8`。
+20
查看文件
@@ -0,0 +1,20 @@
{
"title": "大鱼调色 1.14.3 公测版|图章稳定跟踪与逐帧预览",
"content": "<!-- wp:paragraph -->\n<p>大鱼调色是适用于 Final Cut Pro 和 Motion 的原生 FxPlug 4 调色插件。1.14.3 公测版改善仿制图章跟踪时的跳动与闪烁,并为图章和蒙版加入跟踪进度与逐帧预览。</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.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,颗粒、晕光、蒙版等时间或空间效果不属于静态 LUT 的保存范围。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>胶片模拟与印片外观</strong>:包含减色、颗粒、晕光、辉光、暗角及通道混合器,提供 Kodak 2383、Fuji 3513 等八种印片外观,可独立调整强度。</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\">历史更新</h2>\n<!-- /wp:heading -->\n\n<!-- wp:heading {\"level\":3} -->\n<h3 class=\"wp-block-heading\">1.13.2 安装完整性校验</h3>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p>主 App 注册插件前会检查官方签名和文件完整性。如果检测到掉签、重签或安装内容被修改,主 App 会停止自动更新,并尝试撤销当前副本的插件登记。Final Cut Pro 或 Motion 启动插件服务时,还会再做一次验签。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading {\"level\":3} -->\n<h3 class=\"wp-block-heading\">1.12.0 统一调色工作区与共享蒙版</h3>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>统一调色工作区</strong>。从画布右下角或检视器点击“控制面板”。左侧管理图层,中间调节选中的模块,右侧同时显示亮度波形、RGB 分列、直方图和带肤色参考线的矢量图。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>画布工具与共享蒙版</strong>。左下角可直接绘制矩形、椭圆和钢笔蒙版,也能打开曲线、畸变、肤色范围或 LUT。一个蒙版可同时作用于 HSL、蜘蛛盘等多个Line truncated
"excerpt": "大鱼调色 1.14.3 改善仿制图章跟踪时的跳动与闪烁。图章和蒙版都支持跟踪进度和逐帧预览。官方原始安装包不加密,不限制安装数量。",
"status": "publish",
"seo": {
"title": {
"enabled": true,
"value": "大鱼调色 1.14.3 公测版|图章稳定跟踪与逐帧预览"
},
"description": {
"enabled": true,
"value": "大鱼调色 1.14.3 是适用于 Final Cut Pro 和 Motion 的原生调色插件。新版平滑仿制图章的取样与覆盖轨迹,为图章和蒙版加入跟踪进度及逐帧预览。官方 PKG 已签名公证,不加密,不限制安装数量。支持 Apple Silicon 和 macOS 14.6 或更新版本。"
},
"keywords": {
"enabled": true,
"value": "大鱼调色,Final Cut Pro,Motion,FxPlug4,调色插件,仿制图章,蒙版跟踪,逐帧预览"
}
}
}
+11
查看文件
@@ -0,0 +1,11 @@
# 大鱼调色 1.14.3(94)
仿制图章现在平滑取样点、覆盖区和两边的缩放轨迹,减少相邻帧跳动。跟踪中的复制画面随小于一个像素的移动连续变化,在相对缩放经过 1 倍或取样区域经过画面边缘时平滑过渡。
仿制图章与普通蒙版共用跟踪进度和同步预览。控制面板右侧显示分析方向、帧数、百分比和当前源帧。图章同时标出取样与覆盖区域,蒙版显示对应轮廓。跟踪结束后可查看最后一帧,再返回示波器。
已有图章可选中后重新执行双向跟踪,应用新的轨迹平滑。
支持 Apple Silicon 和 macOS 14.6 或更新版本。安装包已完成 Developer ID Installer 签名、公证及票据验证。
安装包共 45,381,192 字节。SHA-256 为 `6df64ae33f99bab95f8dc4e80d70a717fb210b35f90ce52cb38d47d814e709f4`。
二进制文件未显示。

之后

宽度:  |  高度:  |  大小: 1.6 MiB

二进制文件未显示。

之后

宽度:  |  高度:  |  大小: 3.3 MiB

+11
查看文件
@@ -0,0 +1,11 @@
# 大鱼调色 1.14.4(95)
修复 1.14.3 安装包中四个资源文件的读取权限。用新版 PKG 安装后,普通用户可以读取这些资源,主 App 可完成插件注册。
启动时校验主 App 和 FxPlug 服务的官方签名、执行文件及版本一致性。下载更新包时继续执行完整的签名和资源检查。
安装前先退出 Final Cut Pro 和 Motion。运行原始 PKG,安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。安装完成后重新打开宿主。
支持 Apple Silicon 和 macOS 14.6 或更新版本。安装包已通过 Developer ID Installer 签名、公证、票据及载荷权限验证。
安装包大小为 45,381,319 字节,SHA-256 为 `d9184b1ee1f44723e4fe9fa87c76878884dc8a4fe5c421712650852b0b2ece59`。
+11
查看文件
@@ -0,0 +1,11 @@
# 大鱼调色 1.15.0(96)
默认使用深色主题,已有主题偏好会继续生效。
Final Cut Pro 的「效果 → 大鱼调色」新增「一级调色」和「HSL」独立效果。应用后默认打开对应模块,保留屏幕工具、控制面板和添加模块入口。两款模板只发布自定义检查器。
画面右下角新增「水平校正」。选择水平或垂直,点两端或拖出参考线。画面自动旋转并放大填边,支持撤销与重置。校正随效果和完整预设保存。
安装前退出 Final Cut Pro 和 Motion。使用原始 PKG 安装到固定 FxPlug 位置,重新打开宿主后可在效果浏览器中找到三个入口。支持 Apple Silicon 和 macOS 14.6 或更新版本。
安装包为 46,649,171 字节,SHA-256 为 `3cf708b5fe3f42013b1c2ab4b714978068446cada167ef8d67ee9efdc449c257`。Developer ID 签名、Apple 公证、票据及载荷验证通过。
+6
查看文件
@@ -1,5 +1,11 @@
# 大鱼调色
## 独立效果与水平校正
在 Final Cut Pro 的「效果 → 大鱼调色」可选「大鱼调色」「一级调色」或「HSL」。独立效果打开对应模块,保留画面工具栏和控制面板,可继续添加其他调色模块。
选中效果后,点击画面右下角「水平校正」,选择「水平」或「垂直」,点参考线的两端或拖出一条线。插件旋转画面并自动放大覆盖四角。可按 Esc 退出画线、用宿主撤销上一笔,或在工具中点「重置」恢复原构图。完整预设可保存校正,静态 Cube 无法表达旋转与裁边。
## 1.12.0 统一工作区与共享蒙版
画布左侧保留常驻蒙版、透明曲线与直方图、畸变、肤色范围及LUT入口,底部“控制面板”打开统一工作区。横排工具添加真实图层,左侧选层,右侧编辑;普通检查器与工作区共用宿主状态。LUT保留原缩略图和异步浏览逻辑,示波器收在同一窗口。
+66
查看文件
@@ -1,3 +1,57 @@
# 2026-11-06 独立效果与水平校正 1.15.0(96)
远程 `https://dayu.media/git/dayu/dayu-color.git`,main。实际编译源码为 `a2a6e57c13977ea2fc313f91b4d765ea86498f10`。独立远端克隆检出此节点,核对了 640 个跟踪文件、Git 完整性及本地模板校验。沿用 Xcode 27.1、FxPlug SDK 4.3.5、锁定的 OpenCV 4.5.1、Apple Silicon、macOS 14.6+ 和 Release。无 LFS 或子模块。证书及公证凭据单独恢复。
模板生成入口为 `python3 tools/build_template.py --starters --refresh-model --overwrite`,验证用 `python3 tools/verify_template.py`。打包使用 `Packaging/build_pkg.py`。三个入口随已公证 App 分发,唯一正式路径是 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。App 公证 `0d7b1f05-9ca7-4429-9dbd-7e484d9e9134` 为 Accepted,898 项原生自检通过。[App 交付](verification/Delivery.json) · [FCP 12.4 验收](verification/HostLevel1.15.0.json)
安装包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.15.0.pkg` 为 46,649,171 字节,SHA-256 `3cf708b5fe3f42013b1c2ab4b714978068446cada167ef8d67ee9efdc449c257`。PKG 公证 `d92ced8c-21c3-4970-aa07-b623c10b4e4d` 为 Accepted,20 项展开检查和 142 条 App 载荷权限检查通过。正式 APP 通过独立安装验收。[安装包记录](verification/Package.json)
# 2026-11-06 安装权限修复 1.14.4(95)
在 `https://dayu.media/git/dayu/dayu-color.git` 的 main 检出实际编译节点 `9f5f0659774c8c05e2640db0d62fb61cb529734e`。权限修正和打包检查来自 `474bff9ea9713df28e587de712613e7748200627`。沿用 Xcode 27.1、FxPlug SDK 4.3.5、OpenCV 4.5.1、Release、Apple Silicon 和 macOS 14.6+。本版无 LFS、子模块或新增外部构建资源。签名和公证凭据独立恢复。
使用 `tools/deliver.py` 从源恢复。正式路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 Bundle ID `com.dayu.color`,FxPlug `com.dayu.color.XPC`,签名团队 `B3W25FX5H5`。APP 公证 `59b626ba-f8b3-487f-84b6-cfca0bb66e6f` Accepted。893 项原生自检、主 App 注册和 FCP 12.4 正式路径宿主验收通过。[APP 交付](verification/Delivery.json) · [验签和权限核验](verification/Integrity1.14.4.json)
使用 `Packaging/build_pkg.py`,先检查正式 App 的权限,再验证最终安装包的 BOM。1.14.4 正式 PKG 为 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.14.4.pkg`,45,381,319 字节,SHA-256 `d9184b1ee1f44723e4fe9fa87c76878884dc8a4fe5c421712650852b0b2ece59`,公证 `3a7eda14-7386-45ec-88fc-5c7676eca2e8` Accepted。20 项展开验包和 134 条 App 载荷权限核对通过。正式 APP 经独立安装,安装器系统脚本未在本机重新执行。[安装包记录](verification/Package.json)
发行标签 `v1.14.4-install-permissions-20261106` 指向 `a7926f7e13ef19ade42c2cd898c353a9a37fb8f9`。独立远程检出核对了 635 个跟踪文件、Git 完整性及最终包记录。Release 396/附件 40 已发布,草稿与正式下载(含匿名直链)均核对字节数及 SHA-256。已清理验包副本、临时下载和未发布的权限异常 95 候选。[Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.14.4-install-permissions-20261106) · [安装包下载](https://dayu.media/git/dayu/dayu-color/releases/download/v1.14.4-install-permissions-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.14.4.pkg) · [发布回读](verification/Release.json)。原站点文章 15792 的下载已切换至 1.14.4(95),站内附件 15865 从文章的下载目标完整取回,与正式包逐字节一致,票据通过。主 App 公测更新通道上次回读为 1.12.0(79)。[文章回读与下载校验](verification/Article1.14.4.json)
以下为 1.14.3 历史交付和更早记录。
---
# 2026-11-06 仿制图章稳定和逐帧预览 1.14.3(94)
从 `https://dayu.media/git/dayu/dayu-color.git` 的 main 检出实际编译提交 `6515e0fa67511a7c5ba2cc3320b7c5d9688c41a3`。独立远端检出 627 个跟踪文件,提交树与本地匹配,Git 完整性检查通过。沿用 Xcode 27.1、FxPlug SDK 4.3.5、锁定的 OpenCV 4.5.1、Release、Apple Silicon 和 macOS 14.6+。无 LFS 或子模块。正式位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`,内嵌服务 ID `com.dayu.color.XPC`,签名团队 `B3W25FX5H5`。证书私钥和 Apple 公证凭据单独恢复。
使用 `tools/deliver.py` 交付,APP 公证 `2a47ad51-e07e-48df-960d-1f182635e03d` 为 Accepted,票据、Gatekeeper、唯一 PluginKit 路径和 893 项原生检查通过。FCP 12.4 实拍图章与矩形蒙版各完成 190 帧双向跟踪,画面与轮廓逐帧同步。[交付记录](verification/Delivery.json) · [宿主验收](verification/HostTrackingPreview1.14.3.json)
使用 `Packaging/build_pkg.py` 生成 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.14.3.pkg`。Developer ID Installer 签名、公证 `7b430f78-cb9c-42d2-95aa-ea5fbe440ea5` Accepted、票据、Gatekeeper 及 20 项展开核验通过。包大小 45,381,192 字节,SHA-256 `6df64ae33f99bab95f8dc4e80d70a717fb210b35f90ce52cb38d47d814e709f4`。[验包记录](verification/Package.json)
发行标签 `v1.14.3-tracking-preview-20261106` 指向 `8b96e8b8c1b0c9356ae9871a2bc042a83e7e97d6`。独立检出标签验证 629 个跟踪文件、Git 完整性与包记录。公测 Release 395 的附件 39 已发布,草稿和正式附件均完整下载核验。正式安装通过后已清理 91 至 93 版生成副本、构建 APP、公证 ZIP、远端恢复副本及草稿下载副本。[发行页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.14.3-tracking-preview-20261106) · [下载安装包](https://dayu.media/git/dayu/dayu-color/releases/download/v1.14.3-tracking-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.14.3.pkg) · [发布核验](verification/Release.json)
# 2026-11-06 仿制图章双点跟踪 1.14.0(90)
从 `https://dayu.media/git/dayu/dayu-color.git` 的 main 检出实际编译提交 `810bbf4dfb0a05bc2fa66da546ca75b9610985a3`。独立远端检出 624 个跟踪文件,与编译提交树一致,Git 完整性检查通过。构建沿用 Xcode 27.1、FxPlug SDK 4.3.5、OpenCV 4.5.1 锁定依赖、Release、Apple Silicon 和 macOS 14.6+。无 LFS 或子模块。正式路径为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`,服务 ID `com.dayu.color.XPC`,签名团队 `B3W25FX5H5`。证书私钥和 Apple 公证凭据单独恢复。
使用 `tools/deliver.py` 构建、签名、公证和安装。APP 公证号 `1e7a48fe-dd0a-4643-b587-66eaa05ed46a` 为 Accepted。正式安装通过 881 项原生检查、票据和 Gatekeeper,PluginKit 只登记正式位置。FCP 12.4 实拍双向跟踪确认两个位置与横纵缩放随帧独立变化,257 个键按 25fps 连续保存。旧版可读数据、跟丢和片尾偏移的测试见 [宿主核验](verification/HostCloneTracking1.14.0.json)。
用 `Packaging/build_pkg.py` 从已验收的正式 APP 生成 `../发行包/大鱼调色-1.14.0.pkg`。Developer ID Installer 签名、Apple 公证 `bea7b45f-7d68-4b6d-9173-93ee5ad8b162` Accepted、票据与 20 项展开验包通过。大小 45,370,597 字节,SHA-256 `884342ab5ef0c42d873a6411b6c2bf0ae3cec2e07dedda90b308b057ff59f5e8`。[安装包报告](verification/Package.json)
版本标签 `v1.14.0-clone-tracking-20261106` 指向 `c86925d967d5d13a5ea1ffba31a8221608bc8345`。独立检出标签验证 626 个文件、正式包报告和 Git 完整性。公测 Release 394/附件 38 已发布,草稿和发布后附件分别完整下载,字节数及 SHA-256 一致。旧 APP、构建 APP、公证 ZIP、远端恢复副本和草稿下载副本已清理。[发布页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.14.0-clone-tracking-20261106) · [下载](https://dayu.media/git/dayu/dayu-color/releases/download/v1.14.0-clone-tracking-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.14.0.pkg) · [发布核验](verification/Release.json)站点文章 15792 对应 1.13.2,主 APP 公测清单对应 1.12.0。
# 2026-11-05 安装完整性加固 1.13.2(86)
从 `https://dayu.media/git/dayu/dayu-color.git` 检出实际编译提交 `db6b2b05b3ee2ad40a6aeab70017a2b121caa67d`。独立远端检出核对 618 个文件和 Git 完整性,无子模块。沿用 Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+、Release 和已有锁定依赖。正式 APP 固定在 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,签名团队为 `B3W25FX5H5`。签名、公证登录和证书私钥单独恢复。
验签覆盖主 APP 登记、内嵌 FxPlug 服务启动和自动更新入口。保持现有效果 UUID、原始安装包的转发与离线使用。验签失败会停止当前副本更新并尝试撤销它的登记。系统可自行发现磁盘上的插件,FxPlug 启动检查独立执行。后端更新通道沿用现有策略。验证见 [完整性测试](verification/Integrity1.13.2.json) 和 [宿主验收](verification/HostIntegrity1.13.2.json)。
使用 `tools/deliver.py` 从正式路径安装验收,再通过 `Packaging/build_pkg.py` 打包。正式 PKG 为 `../发行包/大鱼调色-1.13.2.pkg`,45,359,239 字节,SHA-256 `6c18bc081cd9d5099ae821df5d5da43585f9db292345c18db4a4e12cce1f133f`。APP 与 PKG 均签名、公证 Accepted、票据验证通过,安装包通过 20 项展开核验。版本标签为 `v1.13.2-integrity-20261105`。[APP 交付](verification/Delivery.json) · [PKG 验包](verification/Package.json)
公测 Release 393 的附件 37 已发布。发布前草稿和发布后附件分别完整下载,字节数和 SHA-256 均与正式 PKG 匹配。标签完整提交为 `5252296b7b628c8df7e68dfb48df0db38cd12a75`,独立远端检出通过 621 个文件、安装包记录和 Git 完整性核对。临时下载、恢复副本和 APP 生成副本已清理。[发布核验](verification/Release.json)
[站点原文章 15792](https://dayu.media/15792/) 已更新至 1.13.2。正文、SEO、原封面、普通用户 50 元和有效会员免费均已核对,主下载包完整下载与正式 PKG 一致。文章发布输入为 `Publishing/1.13.2/Article-Payload.json`,后台原始回读仅保存在本机缓存。主 APP 公测更新清单回读仍为 1.12.0(79)。[文章核验](verification/Article1.13.2.json)
# 2026-11-05 检视器与画布控件 1.12.1(81)
正式 APP 位于 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`,服务 ID `com.dayu.color.XPC`。实际编译源码为 `43320c7ccdfc6738ba3c380888bb7f3ea75ebb87`,已推送至 `https://dayu.media/git/dayu/dayu-color.git` 的 main。恢复编译时检出该提交,沿用下节的 Xcode 27.1、FxPlug SDK 4.3.5、Release 和锁定依赖流程。正式签名及公证凭据独立恢复。
@@ -129,6 +183,16 @@ Release384/附件28已发布,草稿浏览器完整下载和发布后再次完
# 大鱼调色恢复说明
## 1.13.1(85)等像素仿制图章
实际编译提交 `1659f3d3853e2574f06a45687141fb444b5d02ca`。正式 APP 固定路径、Bundle ID 与签名团队沿用 1.13.0。Apple 公证 `e1d669d2-821b-46a8-99bc-05c847c91a15` Accepted,票据、Gatekeeper、PluginKit 唯一正式位置、864 项原生检查和 FCP 12.4 读入旧图章通过。84 版验证了取样点拖动后被 85 版替代,未单独打包。83 和 84 的临时 APP 回退副本已清理。
独立远端克隆核对 613 个编译节点文件,Git full/strict、逐文件 SHA-256 通过,无 LFS 或子模块。继续沿用 Xcode 27.1、Metal 工具链、FxPlug SDK 4.3.5 与 macOS 14.6+ Apple Silicon。构建使用 `tools/deliver.py`,打包使用 `Packaging/build_pkg.py`。[宿主验收](verification/HostCloneSource1.13.1.json) · [独立源码恢复](verification/CloneSourceRecovery1.13.1.json)
正式安装包 `../发行包/大鱼调色-1.13.1.pkg`,45,352,349 字节,SHA-256 `8a19afadda6317d186541f37a221c46261a22ddabcdddec90d02e1315b693965`,公证 `b85219d9-d465-4827-bdb6-3023eb161159` Accepted。Developer ID Installer 签名、票据、Gatekeeper 和 20 项实际展开检查通过。版本标签为 `v1.13.1-pixel-clone-20261105`。本机使用独立 APP 安装验收。
[公测 Release 392](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.13.1-pixel-clone-20261105) 的附件 36 已通过草稿下载和正式附件二次下载校验。标签提交 `46153a26edfbf44c5f22fbad5953ec74c0d33883` 的 616 个文件、编译提交关系和安装包记录通过独立远程恢复。[发布证据](verification/Release.json)
## 1.13.0(83)画布响应与仿制图章
实际编译提交为 `9977b5c41b07e0b08e6408c492498ba6e396c981`。正式 APP 固定在 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,外层 `com.dayu.color`,XPC `com.dayu.color.XPC`。团队 B3W25FX5H5,Apple 公证 `a9134875-aea9-4150-9e61-3051d23cd809` 为 Accepted,票据、Gatekeeper 和 PluginKit 通过。82 版实窗发现系统符号未渲染,由绘制自有图标的 83 版替代。81 和 82 的本轮临时回退副本在验收后清理,历史发行包保留。
@@ -138,6 +202,8 @@ Release384/附件28已发布,草稿浏览器完整下载和发布后再次完
正式安装包 `../发行包/大鱼调色-1.13.0.pkg`,45,350,463 字节,SHA-256 `7999233dd4a3b797a879cc0f37a20f0c35f925c5f6823720b40e684464a452e8`。Developer ID Installer 签名、公证 `13d6f418-4d36-4ef8-a92d-591610cb7682` Accepted、票据、Gatekeeper 和 20 项实际展开检查通过。版本标签为 `v1.13.0-clone-stamp-20261105`。本机已通过独立 APP 安装验收。
[公测 Release 391](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.13.0-clone-stamp-20261105) 的附件 35 已通过草稿下载和正式附件二次下载校验。标签完整提交 `07601e50bf604e7721bccf8be10e403a2bd030d1`,独立恢复版本标签和安装包记录通过。[发布证据](verification/Release.json)
## 当前1.8.0(55):版本化 ACES 色彩管理
远程 `https://dayu.media/git/dayu/dayu-color.git`,main;发行标签 `v1.8.0-cms-20261103`。实际编译源码 `11a88518280f0665f3cd0f388d1d66e5446ece14`,可先以该完整 SHA 恢复程序,标签与安装包的最终远程核验见 `verification/Release.json`。无 LFS 或子模块。固定 OCIO 2.5.2 / ACES 1.3 配置与全部必要依赖源码包、SHA-256 和许可证已放入 `ColorManagement/`,不依赖兄弟应用或其工作副本。
+597
查看文件
@@ -0,0 +1,597 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ozxmlscene>
<ozml version="5.11">
<displayversion>5.4.5</displayversion>
<factory id="1" uuid="46c844a813d311d8a438000a95af9f7e">
<description>Channel</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<factory id="2" uuid="65cb4dc9d4504fa281921f5f751fba06">
<description>小组件</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<factory id="3" uuid="66fc0d6af6a911d6a7a7000393670732">
<description>图像</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<factory id="4" uuid="7d468273c013498e9806a0d7bc32fddf">
<description>项目</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<factory id="5" uuid="deca4859b16011d7a12d0003936f6f92">
<description>ProPlugin 滤镜</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<build />
<description />
<canvas>
<layout>1</layout>
<activeView>0</activeView>
</canvas>
<viewer subview="0">
<resolutionMode>0</resolutionMode>
<dynamicResolution>0</dynamicResolution>
<viewmode>0</viewmode>
<overlayOptions>92956</overlayOptions>
<oscOptions>30</oscOptions>
<compensateAspectRatio>1</compensateAspectRatio>
<renderFields>0</renderFields>
<showMotionBlur>0</showMotionBlur>
<showFrameBlending>1</showFrameBlending>
<showLighting>1</showLighting>
<showShadows>1</showShadows>
<showReflection>1</showReflection>
<showDepthOfField>0</showDepthOfField>
<renderFullView>0</renderFullView>
<renderQuality>2</renderQuality>
<textRenderQuality>2</textRenderQuality>
<showHighQualityResampling>0</showHighQualityResampling>
<showShapeAntialiasing>1</showShapeAntialiasing>
<show3DIntersectionAntialiasing>0</show3DIntersectionAntialiasing>
<cameraType>0</cameraType>
<cameraName>活跃的摄像机</cameraName>
<mirrorHMD>0</mirrorHMD>
<panZoom camera="0" zoom="0.43564814329147339" panX="726" panY="3" mode="2" centered="1" />
<panZoom camera="1" zoom="0.15078124403953552" panX="19" panY="129" mode="2" centered="1" />
</viewer>
<projectPanel>
<layersPreviewColumn>1</layersPreviewColumn>
<layersOpacityColumn>0</layersOpacityColumn>
<layersBlendColumn>0</layersBlendColumn>
<displayMasks>1</displayMasks>
<displayBehaviors>1</displayBehaviors>
<displayEffects>1</displayEffects>
<layersVerticalZoom>1.7999999523162842</layersVerticalZoom>
<mediaPreviewColumn>1</mediaPreviewColumn>
<mediaTypeColumn>1</mediaTypeColumn>
<mediaDurationColumn>1</mediaDurationColumn>
<mediaInUseColumn>1</mediaInUseColumn>
<mediaFrameSizeColumn>1</mediaFrameSizeColumn>
<mediaCompressorColumn>1</mediaCompressorColumn>
<mediaDepthColumn>1</mediaDepthColumn>
<mediaFrameRateColumn>1</mediaFrameRateColumn>
<mediaDataRateColumn>1</mediaDataRateColumn>
<mediaAudioRateColumn>1</mediaAudioRateColumn>
<mediaAudioFormatColumn>1</mediaAudioFormatColumn>
<mediaFileSizeColumn>1</mediaFileSizeColumn>
<mediaFileCreatedColumn>1</mediaFileCreatedColumn>
<mediaDileModifiedColumn>1</mediaDileModifiedColumn>
<mediaVerticalZoom>1.7999999523162842</mediaVerticalZoom>
</projectPanel>
<timeline>
<displayVideo>1</displayVideo>
<displayAudio>0</displayAudio>
<displayKeyframes>1</displayKeyframes>
<displayMasks>1</displayMasks>
<displayBehaviors>1</displayBehaviors>
<displayEffects>1</displayEffects>
<videoVerticalZoom>2.2222222222222223</videoVerticalZoom>
<audioVerticalZoom>1.5555555820465088</audioVerticalZoom>
<displayRange in="-441795416 1729492187 3 0" out="10265448055 1000000000 3 0" />
</timeline>
<curveeditor>
<autozoom>0</autozoom>
<snapping>0</snapping>
<displayAudioWaveform>0</displayAudioWaveform>
<lockKeyframesInTime>0</lockKeyframesInTime>
<displayRange in="-441795416 1729492187 3 0" out="10265448055 1000000000 3 0" />
<currentviewvolume originx="-0.25544805540078452" originy="-62.5" width="10.520896110000001" height="125" />
<snapshotChannels>0</snapshotChannels>
</curveeditor>
<inspector>
<collapseState id="./1/100" state="1" />
<collapseState id="./1/200" state="1" />
<collapseState id="./1/344" state="1" />
</inspector>
<scene>
<sceneSettings>
<width>3840</width>
<height>2160</height>
<duration>600</duration>
<shouldOverrideFCDuration>0</shouldOverrideFCDuration>
<frameRate>60</frameRate>
<NTSC>1</NTSC>
<pixelAspectRatio>1</pixelAspectRatio>
<workingGamut>0</workingGamut>
<viewGamut>-1</viewGamut>
<optimizeForDisplay>0</optimizeForDisplay>
<backgroundColor red="0" green="0" blue="0" alpha="0" />
<audioChannels>2</audioChannels>
<audioBitsPerSample>32</audioBitsPerSample>
<fieldRenderingMode>0</fieldRenderingMode>
<motionBlurSamples>8</motionBlurSamples>
<motionBlurDuration>1</motionBlurDuration>
<sharpScaling>0</sharpScaling>
<startTimecode>0</startTimecode>
<presetPath>/Applications/Motion.app/Contents/Resources/zh_CN.lproj/Presets/Project/4K - Ultra HD.preset</presetPath>
<backgroundMode>0</backgroundMode>
<reflectionRecursionLimit>2</reflectionRecursionLimit>
<glyphOSCMode>0</glyphOSCMode>
<animateFlag>0</animateFlag>
<parameterColorSpaceID>3</parameterColorSpaceID>
<savePreviewMovie>0</savePreviewMovie>
</sceneSettings>
<publishSettings>
<version>2</version>
<target object="10060" channel="./9000" name="大鱼调色" />
</publishSettings>
<currentFrame>0 1 1 0</currentFrame>
<currentObject>10000</currentObject>
<timeRange offset="0 1 1 0" duration="1201200 120000 1 0" />
<playRange offset="0 1 1 0" duration="1201200 120000 1 0" />
<flags>129</flags>
<audioTracks>0</audioTracks>
<timemarkerset />
<guideset />
<curvesets selected="1" />
<scenenode name="项目" id="10000" factoryID="4" version="5">
<scenenode name="小组件" id="10002" factoryID="2" version="5">
<flags>0</flags>
<timing in="0 1 1 0" out="-2002 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>16</baseFlags>
<parameter name="属性" id="1" flags="8589938704" />
<parameter name="对象" id="2" flags="8589938704">
<parameter name="选项" id="103" flags="8589938688" />
<parameter name="Hidden" id="102" flags="8589934608" default="0" value="1" />
<parameter name="快照" id="101" flags="8589938706" />
<parameter name="小组件" id="100" flags="8589934608" default="1.7777777777777777" value="1.7777777777777777" />
</parameter>
</scenenode>
<flags>0</flags>
<timing in="0 1 1 0" out="-2002 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>268435473</baseFlags>
<parameter name="属性" id="1" flags="8589938704" />
<parameter name="对象" id="2" flags="8589938704" />
</scenenode>
<layer name="群组 1" id="10047">
<scenenode name="效果源" id="10050" factoryID="3" version="5">
<validTracks>1</validTracks>
<aspectRatio>0</aspectRatio>
<flags>0</flags>
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
<foldFlags>16384</foldFlags>
<baseFlags>524304</baseFlags>
<parameter name="属性" id="1" flags="8589938704">
<parameter name="电影效果" id="344" flags="8589938706">
<foldFlags>131076</foldFlags>
<parameter name="景深" id="346" flags="8589934608" default="1.3999999999999999" value="2" />
<parameter name="焦点" id="348" flags="8589938706">
<foldFlags>15</foldFlags>
</parameter>
</parameter>
<parameter name="颜色" id="243" flags="8589938688">
<parameter name="Hidden Channel" id="245" flags="8589934610" default="1" value="3" />
<parameter name="转换类型" id="247" flags="8590032912" default="3" value="3" />
<parameter name="PQ 峰值(尼特)" id="248" flags="8589967376" default="1000" value="1000" />
</parameter>
<parameter name="媒体" id="324" flags="8589938704">
<parameter name="源媒体" id="300" flags="81604444176" default="10048" value="10048" />
<parameter name="源媒体" id="325" flags="8590000146" />
</parameter>
<parameter name="页码" id="301" flags="8589934610" default="1" value="1" />
<parameter name="重新定时值" id="304" flags="8590066066" default="1" value="1" />
<parameter name="重新定时值缓存" id="319" flags="8590065810" default="1" value="1" />
</parameter>
<parameter name="对象" id="2" flags="8589938704">
<parameter name="拖放区" id="311" flags="8589934738" default="0" value="1" />
<parameter name="类型" id="321" flags="8590000146" default="0" value="3" />
<parameter name="移动" id="326" flags="77309415442">
<foldFlags>15</foldFlags>
</parameter>
<parameter name="缩放" id="327" flags="77309415442">
<foldFlags>15</foldFlags>
</parameter>
<parameter name="填充不透明" id="328" flags="8589934608" default="0" value="0" />
<parameter name="填充颜色" id="329" flags="8589938704">
<foldFlags>15</foldFlags>
</parameter>
<parameter name="清除" id="315" flags="8590000144" default="0" value="0" />
<parameter name="宽度" id="313" flags="8589934610" default="1" value="3840" />
<parameter name="高度" id="314" flags="8589934610" default="1" value="2160" />
</parameter>
<filter name="大鱼调色" id="10060" factoryID="5" pluginUUID="1C17B73B-F229-4C09-A434-EAF6DFF5F22A" pluginVersion="0" pluginName="大鱼调色" pluginDynamicParams="0">
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
<baseFlags>8589934608</baseFlags>
<parameter name="大鱼调色" id="9000" flags="12884901888">
<numberOfKeypoints>0</numberOfKeypoints>
<defaultVal>*********Y*eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-U47kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OQ91-AP5-oXJGFiRKlgokoC1l*F2ZJaPqlYQpNnMqVZPK3K74BgMLBnU*6E*c*4olEJ1lMM4ZRCImtfNLZnKYtH9axWOaJXR5CV3s*1cFa*-6*3IqVnP*XG5VwU6JcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6U6ZVCIoxWOaJXRB6S5mEZLl*EF3Z7PbBkNKBoPr7IPqhZPe6a6ZwE22FNGKtnQ4JXR4xmJ4xfNKs*0**F*-c*7**d*16*Bk-7*2k*K*-O*46*O*-j*5I*T*01*6I*Vk07*7**a*0X*8I*dk0d*8g*fE0l*96*hk10*Ag*q*1P*CE*uE1w*Dw********0*E*********b*******************-2UU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-zk********6-*********-********************6***</defaultVal>
<dataValue>*********Y*eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-U47kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OQ91-AP5-oXJGFiRKlgokoC1l*F2ZJaPqlYQpNnMqVZPK3K74BgMLBnU*6E*c*4olEJ1lMM4ZRCImtfNLZnKYtH9axWOaJXR5CV3s*1cFa*-6*3IqVnP*XG5VwU6JcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6U6ZVCIoxWOaJXRB6S5mEZLl*EF3Z7PbBkNKBoPr7IPqhZPe6a6ZwE22FNGKtnQ4JXR4xmJ4xfNKs*0**F*-c*7**d*16*Bk-7*2k*K*-O*46*O*-j*5I*T*01*6I*Vk07*7**a*0X*8I*dk0d*8g*fE0l*96*hk10*Ag*q*1P*CE*uE1w*Dw********0*E*********b*******************-2UU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-zk********6-*********-********************6***</dataValue>
</parameter>
<parameter name="LUT 文件" id="9001" flags="12889161776">
<numberOfKeypoints>0</numberOfKeypoints>
<defaultVal>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</defaultVal>
<dataValue>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</dataValue>
</parameter>
<parameter name="工具与蒙版" id="9002" flags="12889161776">
<numberOfKeypoints>0</numberOfKeypoints>
<defaultVal>*********uweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl20vq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OwE5UgA2G2W6mEZ7WQfAI71F2J4FoV7GYhAHItDI3BIJpIYPbJgPB6B1UwEK4FjMrJhNKtoJWFXP43nQs*0U-rH2VAC3-cUJotH9ahZSLBOHZAiPq7eNKBoQuIJ3VQM4M*1U*G*-M*4U*SZ4lkR5Vy*06*7U*i*4s*QU*dPQrFVQbFZQZFjPqlNMa3nNIpVQqhnKr7ZPKxqNKF0MLBZJbBXO4JhMJNgMLZZQbBHO5Bgol6H1WUd680UU*fG90oi9pcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6iA3VCIoxWOaJXRB6H1X7-fXAoBHMrC1YuCnkxDXx*U*m*1M*CU*y*26*FU-8*2s*IU-K*3c*LU-W*4M*OJr-mOKpVQbZKQr-dN4JmJ47VQqJIQqhdPZFgPqxfJKBpQbNZJqRmMKFdPaRNQ57dPK3mOKJnJalZRaJgQpdWP43XOrRcOLFZJq7VP43iMqJJPKZsNL7INaZgPJFgNKtnoWkhIJ7LHZB-Qb7VSO7FA-*-oVACJI4UU-fG90pMKJt2KJFjPql2PqBpPKJiR87OA3t2KJFjPql2PqBpPKJiR**6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*Sk0-*6M*Xk0K*7U*aU0V*8Y*h*0u*9k*jU1**A6*l*18*Ak*nU1E*B6*p*1K*C6*v*1s*Dw--U28*F2-2U2H*FI-4U2Z*Gs-Ck2y*IQ-H*3P*Jo-Lk3V*KA-NE3b*KY-Ok3h*Kw-QE3n*LI-Rk3t*M2-W*4B*N6-Zk4R*OI-fk4q*Q2-mE5D*RE-qE5S*SM-uE5f*T*-wE5n*TU0-k68*********U2*********Kk*******************VY6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*qs********0*E*********E*******************1Pk*</defaultVal>
<dataValue>*********uweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl20vq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OwE5UgA2G2W6mEZ7WQfAI71F2J4FoV7GYhAHItDI3BIJpIYPbJgPB6B1UwEK4FjMrJhNKtoJWFXP43nQs*0U-rH2VAC3-cUJotH9ahZSLBOHZAiPq7eNKBoQuIJ3VQM4M*1U*G*-M*4U*SZ4lkR5Vy*06*7U*i*4s*QU*dPQrFVQbFZQZFjPqlNMa3nNIpVQqhnKr7ZPKxqNKF0MLBZJbBXO4JhMJNgMLZZQbBHO5Bgol6H1WUd680UU*fG90oi9pcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6iA3VCIoxWOaJXRB6H1X7-fXAoBHMrC1YuCnkxDXx*U*m*1M*CU*y*26*FU-8*2s*IU-K*3c*LU-W*4M*OJr-mOKpVQbZKQr-dN4JmJ47VQqJIQqhdPZFgPqxfJKBpQbNZJqRmMKFdPaRNQ57dPK3mOKJnJalZRaJgQpdWP43XOrRcOLFZJq7VP43iMqJJPKZsNL7INaZgPJFgNKtnoWkhIJ7LHZB-Qb7VSO7FA-*-oVACJI4UU-fG90pMKJt2KJFjPql2PqBpPKJiR87OA3t2KJFjPql2PqBpPKJiR**6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*Sk0-*6M*Xk0K*7U*aU0V*8Y*h*0u*9k*jU1**A6*l*18*Ak*nU1E*B6*p*1K*C6*v*1s*Dw--U28*F2-2U2H*FI-4U2Z*Gs-Ck2y*IQ-H*3P*Jo-Lk3V*KA-NE3b*KY-Ok3h*Kw-QE3n*LI-Rk3t*M2-W*4B*N6-Zk4R*OI-fk4q*Q2-mE5D*RE-qE5S*SM-uE5f*T*-wE5n*TU0-k68*********U2*********Kk*******************VY6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*qs********0*E*********E*******************1Pk*</dataValue>
</parameter>
<parameter name="相机输入" id="2013" flags="12889161760" default="0" value="0" />
<parameter name="旧版输入强度" id="2014" flags="12889161760" default="1" value="1" />
<parameter name="CST 配置版本" id="2236" flags="12889161760" default="0" value="0" />
<parameter name="输入转换启用" id="2241" flags="12889161760" default="1" value="1" />
<parameter name="输入曲线" id="2237" flags="12889161776" default="28" value="28" />
<parameter name="输入色域" id="2238" flags="12889161776" default="27" value="27" />
<parameter name="工作曲线" id="2239" flags="12889161776" default="10" value="10" />
<parameter name="工作色域" id="2240" flags="12889161776" default="16" value="16" />
<parameter name="CST 混合" id="2269" flags="12889161760" default="1" value="1" />
<parameter name="一级调色启用" id="2242" flags="12889161760" default="1" value="1" />
<parameter name="一级曝光" id="2247" flags="12889161760" default="0" value="0" />
<parameter name="色彩平衡方向" id="2248" flags="12889161760" default="0" value="0" />
<parameter name="色彩平衡强度" id="2249" flags="12889161760" default="0" value="0" />
<parameter name="一级饱和度" id="2250" flags="12889161760" default="1" value="1" />
<parameter name="一级对比度" id="2251" flags="12889161760" default="0" value="0" />
<parameter name="对比度轴心" id="2252" flags="12889161760" default="0" value="0" />
<parameter name="高光对比度" id="2253" flags="12889161760" default="0" value="0" />
<parameter name="高光轴心" id="2254" flags="12889161760" default="0" value="0" />
<parameter name="阴影对比度" id="2255" flags="12889161760" default="0" value="0" />
<parameter name="阴影轴心" id="2256" flags="12889161760" default="0" value="0" />
<parameter name="白点" id="2257" flags="12889161760" default="1" value="1" />
<parameter name="肩部压缩" id="2258" flags="12889161760" default="0.5" value="0.5" />
<parameter name="一级高光" id="2259" flags="12889161760" default="0" value="0" />
<parameter name="一级中间调" id="2260" flags="12889161760" default="0" value="0" />
<parameter name="一级阴影" id="2261" flags="12889161760" default="0" value="0" />
<parameter name="黑点" id="2262" flags="12889161760" default="0" value="0" />
<parameter name="趾部压缩" id="2263" flags="12889161760" default="0.5" value="0.5" />
<parameter name="色度混合" id="2264" flags="12889161760" default="0.5" value="0.5" />
<parameter name="旁路一级曝光" id="2265" flags="12889161760" default="0" value="0" />
<parameter name="旁路一级色彩" id="2266" flags="12889161760" default="0" value="0" />
<parameter name="旁路一级对比" id="2267" flags="12889161760" default="0" value="0" />
<parameter name="旁路一级影调" id="2268" flags="12889161760" default="0" value="0" />
<parameter name="输出转换启用" id="2243" flags="12889161760" default="1" value="1" />
<parameter name="输出曲线" id="2244" flags="12889161776" default="1002" value="1002" />
<parameter name="输出色域" id="2245" flags="12889161776" default="22" value="22" />
<parameter name="自动色调映射" id="2246" flags="12889161776" default="0" value="1" />
<parameter name="输入转换 / CST" id="2033" flags="12889161760" default="1" value="1" />
<parameter name="曝光" id="2000" flags="12889161760" default="0" value="0" />
<parameter name="曝光 启用" id="2020" flags="12889161760" default="1" value="1" />
<parameter name="对比度" id="2001" flags="12889161760" default="0" value="0" />
<parameter name="对比度 启用" id="2021" flags="12889161760" default="1" value="1" />
<parameter name="高光" id="2002" flags="12889161760" default="0" value="0" />
<parameter name="高光 启用" id="2022" flags="12889161760" default="1" value="1" />
<parameter name="阴影" id="2003" flags="12889161760" default="0" value="0" />
<parameter name="阴影 启用" id="2023" flags="12889161760" default="1" value="1" />
<parameter name="白色色阶" id="2004" flags="12889161760" default="0" value="0" />
<parameter name="白色色阶 启用" id="2024" flags="12889161760" default="1" value="1" />
<parameter name="黑色色阶" id="2005" flags="12889161760" default="0" value="0" />
<parameter name="黑色色阶 启用" id="2025" flags="12889161760" default="1" value="1" />
<parameter name="色温" id="2006" flags="12889161760" default="0" value="0" />
<parameter name="色温 启用" id="2026" flags="12889161760" default="1" value="1" />
<parameter name="色调" id="2007" flags="12889161760" default="0" value="0" />
<parameter name="色调 启用" id="2027" flags="12889161760" default="1" value="1" />
<parameter name="饱和度" id="2008" flags="12889161760" default="0" value="0" />
<parameter name="饱和度 启用" id="2028" flags="12889161760" default="1" value="1" />
<parameter name="鲜艳度" id="2009" flags="12889161760" default="0" value="0" />
<parameter name="鲜艳度 启用" id="2029" flags="12889161760" default="1" value="1" />
<parameter name="纹理" id="2010" flags="12889161760" default="0" value="0" />
<parameter name="纹理 启用" id="2030" flags="12889161760" default="1" value="1" />
<parameter name="清晰度" id="2011" flags="12889161760" default="0" value="0" />
<parameter name="清晰度 启用" id="2031" flags="12889161760" default="1" value="1" />
<parameter name="去朦胧" id="2012" flags="12889161760" default="0" value="0" />
<parameter name="去朦胧 启用" id="2032" flags="12889161760" default="1" value="1" />
<parameter name="复制时自动调色" id="8800" flags="12889161776" default="0" value="0" />
<parameter name="一级调色总开关" id="2271" flags="12889161760" default="1" value="1" />
<parameter name="蜘蛛盘混合" id="2273" flags="12889161760" default="1" value="1" />
<parameter name="蜘蛛盘校色仪" id="2272" flags="12889161760" default="1" value="1" />
<parameter name="基础调色" id="2034" flags="12889161760" default="1" value="1" />
<parameter name="白平衡与颜色" id="2035" flags="12889161760" default="1" value="1" />
<parameter name="保护程度" id="2117" flags="12889161760" default="60" value="60" />
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
<parameter name="风格 3 启用" id="2041" flags="12889161760" default="1" value="1" />
<parameter name="风格 3 强度" id="2017" flags="12889161760" default="1" value="1" />
<parameter name="风格 4 启用" id="2042" flags="12889161760" default="1" value="1" />
<parameter name="风格 4 强度" id="2018" flags="12889161760" default="1" value="1" />
<parameter name="风格 5 启用" id="2043" flags="12889161760" default="1" value="1" />
<parameter name="风格 5 强度" id="2019" flags="12889161760" default="1" value="1" />
<parameter name="风格 LUT" id="2036" flags="12889161760" default="1" value="1" />
<parameter name="主曲线 阴影" id="2046" flags="12889161760" default="0" value="0" />
<parameter name="主曲线 暗部" id="2047" flags="12889161760" default="0" value="0" />
<parameter name="主曲线 亮部" id="2048" flags="12889161760" default="0" value="0" />
<parameter name="主曲线 高光" id="2049" flags="12889161760" default="0" value="0" />
<parameter name="红曲线 阴影" id="2050" flags="12889161760" default="0" value="0" />
<parameter name="红曲线 高光" id="2051" flags="12889161760" default="0" value="0" />
<parameter name="绿曲线 阴影" id="2052" flags="12889161760" default="0" value="0" />
<parameter name="绿曲线 高光" id="2053" flags="12889161760" default="0" value="0" />
<parameter name="蓝曲线 阴影" id="2054" flags="12889161760" default="0" value="0" />
<parameter name="蓝曲线 高光" id="2055" flags="12889161760" default="0" value="0" />
<parameter name="主曲线 点1 X" id="2056" flags="12889161760" default="-1" value="-1" />
<parameter name="主曲线 点2 X" id="2057" flags="12889161760" default="-1" value="-1" />
<parameter name="主曲线 点3 X" id="2058" flags="12889161760" default="-1" value="-1" />
<parameter name="主曲线 点4 X" id="2059" flags="12889161760" default="-1" value="-1" />
<parameter name="红曲线 点1 X" id="2060" flags="12889161760" default="-1" value="-1" />
<parameter name="红曲线 点2 X" id="2061" flags="12889161760" default="-1" value="-1" />
<parameter name="绿曲线 点1 X" id="2062" flags="12889161760" default="-1" value="-1" />
<parameter name="绿曲线 点2 X" id="2063" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝曲线 点1 X" id="2064" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝曲线 点2 X" id="2065" flags="12889161760" default="-1" value="-1" />
<parameter name="主 扩展点1 偏移" id="2204" flags="12889161760" default="0" value="0" />
<parameter name="主 扩展点1 X" id="2208" flags="12889161760" default="-1" value="-1" />
<parameter name="主 扩展点2 偏移" id="2205" flags="12889161760" default="0" value="0" />
<parameter name="主 扩展点2 X" id="2209" flags="12889161760" default="-1" value="-1" />
<parameter name="主 扩展点3 偏移" id="2206" flags="12889161760" default="0" value="0" />
<parameter name="主 扩展点3 X" id="2210" flags="12889161760" default="-1" value="-1" />
<parameter name="主 扩展点4 偏移" id="2207" flags="12889161760" default="0" value="0" />
<parameter name="主 扩展点4 X" id="2211" flags="12889161760" default="-1" value="-1" />
<parameter name="红 扩展点1 偏移" id="2212" flags="12889161760" default="0" value="0" />
<parameter name="红 扩展点1 X" id="2216" flags="12889161760" default="-1" value="-1" />
<parameter name="红 扩展点2 偏移" id="2213" flags="12889161760" default="0" value="0" />
<parameter name="红 扩展点2 X" id="2217" flags="12889161760" default="-1" value="-1" />
<parameter name="红 扩展点3 偏移" id="2214" flags="12889161760" default="0" value="0" />
<parameter name="红 扩展点3 X" id="2218" flags="12889161760" default="-1" value="-1" />
<parameter name="红 扩展点4 偏移" id="2215" flags="12889161760" default="0" value="0" />
<parameter name="红 扩展点4 X" id="2219" flags="12889161760" default="-1" value="-1" />
<parameter name="绿 扩展点1 偏移" id="2220" flags="12889161760" default="0" value="0" />
<parameter name="绿 扩展点1 X" id="2224" flags="12889161760" default="-1" value="-1" />
<parameter name="绿 扩展点2 偏移" id="2221" flags="12889161760" default="0" value="0" />
<parameter name="绿 扩展点2 X" id="2225" flags="12889161760" default="-1" value="-1" />
<parameter name="绿 扩展点3 偏移" id="2222" flags="12889161760" default="0" value="0" />
<parameter name="绿 扩展点3 X" id="2226" flags="12889161760" default="-1" value="-1" />
<parameter name="绿 扩展点4 偏移" id="2223" flags="12889161760" default="0" value="0" />
<parameter name="绿 扩展点4 X" id="2227" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝 扩展点1 偏移" id="2228" flags="12889161760" default="0" value="0" />
<parameter name="蓝 扩展点1 X" id="2232" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝 扩展点2 偏移" id="2229" flags="12889161760" default="0" value="0" />
<parameter name="蓝 扩展点2 X" id="2233" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝 扩展点3 偏移" id="2230" flags="12889161760" default="0" value="0" />
<parameter name="蓝 扩展点3 X" id="2234" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝 扩展点4 偏移" id="2231" flags="12889161760" default="0" value="0" />
<parameter name="蓝 扩展点4 X" id="2235" flags="12889161760" default="-1" value="-1" />
<parameter name="曲线" id="2044" flags="12889161760" default="1" value="1" />
<parameter name="红 色相" id="2068" flags="12889161760" default="0" value="0" />
<parameter name="橙 色相" id="2069" flags="12889161760" default="0" value="0" />
<parameter name="黄 色相" id="2070" flags="12889161760" default="0" value="0" />
<parameter name="绿 色相" id="2071" flags="12889161760" default="0" value="0" />
<parameter name="青 色相" id="2072" flags="12889161760" default="0" value="0" />
<parameter name="蓝 色相" id="2073" flags="12889161760" default="0" value="0" />
<parameter name="紫 色相" id="2074" flags="12889161760" default="0" value="0" />
<parameter name="洋红 色相" id="2075" flags="12889161760" default="0" value="0" />
<parameter name="红 饱和度" id="2076" flags="12889161760" default="0" value="0" />
<parameter name="橙 饱和度" id="2077" flags="12889161760" default="0" value="0" />
<parameter name="黄 饱和度" id="2078" flags="12889161760" default="0" value="0" />
<parameter name="绿 饱和度" id="2079" flags="12889161760" default="0" value="0" />
<parameter name="青 饱和度" id="2080" flags="12889161760" default="0" value="0" />
<parameter name="蓝 饱和度" id="2081" flags="12889161760" default="0" value="0" />
<parameter name="紫 饱和度" id="2082" flags="12889161760" default="0" value="0" />
<parameter name="洋红 饱和度" id="2083" flags="12889161760" default="0" value="0" />
<parameter name="红 明亮度" id="2084" flags="12889161760" default="0" value="0" />
<parameter name="橙 明亮度" id="2085" flags="12889161760" default="0" value="0" />
<parameter name="黄 明亮度" id="2086" flags="12889161760" default="0" value="0" />
<parameter name="绿 明亮度" id="2087" flags="12889161760" default="0" value="0" />
<parameter name="青 明亮度" id="2088" flags="12889161760" default="0" value="0" />
<parameter name="蓝 明亮度" id="2089" flags="12889161760" default="0" value="0" />
<parameter name="紫 明亮度" id="2090" flags="12889161760" default="0" value="0" />
<parameter name="洋红 明亮度" id="2091" flags="12889161760" default="0" value="0" />
<parameter name="自定义色 R" id="2092" flags="12889161760" default="1" value="1" />
<parameter name="自定义 色相" id="2096" flags="12889161760" default="0" value="0" />
<parameter name="自定义 色相范围" id="2140" flags="12889161760" default="30" value="30" />
<parameter name="自定义色 G" id="2093" flags="12889161760" default="0.10000000000000001" value="0.10000000000000001" />
<parameter name="自定义 饱和度" id="2097" flags="12889161760" default="0" value="0" />
<parameter name="自定义 饱和度范围" id="2141" flags="12889161760" default="40" value="40" />
<parameter name="自定义色 B" id="2094" flags="12889161760" default="0.57999999999999996" value="0.57999999999999996" />
<parameter name="自定义 明亮度" id="2098" flags="12889161760" default="0" value="0" />
<parameter name="自定义 明亮度范围" id="2142" flags="12889161760" default="40" value="40" />
<parameter name="显示自定义色选区" id="2144" flags="12889161760" default="0" value="0" />
<parameter name="HSL 混色" id="2045" flags="12889161760" default="1" value="1" />
<parameter name="阴影 色相" id="2106" flags="12889161760" default="0" value="0" />
<parameter name="阴影 饱和度" id="2107" flags="12889161760" default="0" value="0" />
<parameter name="阴影 明亮度" id="2113" flags="12889161760" default="0" value="0" />
<parameter name="中间调 色相" id="2104" flags="12889161760" default="0" value="0" />
<parameter name="中间调 饱和度" id="2105" flags="12889161760" default="0" value="0" />
<parameter name="中间调 明亮度" id="2112" flags="12889161760" default="0" value="0" />
<parameter name="高光 色相" id="2108" flags="12889161760" default="0" value="0" />
<parameter name="高光 饱和度" id="2109" flags="12889161760" default="0" value="0" />
<parameter name="高光 明亮度" id="2114" flags="12889161760" default="0" value="0" />
<parameter name="全局 色相" id="2148" flags="12889161760" default="0" value="0" />
<parameter name="全局 饱和度" id="2149" flags="12889161760" default="0" value="0" />
<parameter name="全局 明亮度" id="2150" flags="12889161760" default="0" value="0" />
<parameter name="混合" id="2101" flags="12889161760" default="50" value="50" />
<parameter name="平衡" id="2102" flags="12889161760" default="0" value="0" />
<parameter name="颜色分级" id="2100" flags="12889161760" default="1" value="1" />
<parameter name="红原色 色相" id="2121" flags="12889161760" default="0" value="0" />
<parameter name="红原色 饱和度" id="2122" flags="12889161760" default="0" value="0" />
<parameter name="绿原色 色相" id="2123" flags="12889161760" default="0" value="0" />
<parameter name="绿原色 饱和度" id="2124" flags="12889161760" default="0" value="0" />
<parameter name="蓝原色 色相" id="2125" flags="12889161760" default="0" value="0" />
<parameter name="蓝原色 饱和度" id="2126" flags="12889161760" default="0" value="0" />
<parameter name="三原色" id="2120" flags="12889161760" default="1" value="1" />
<parameter name="RGB 输入黑" id="2156" flags="12889161760" default="0" value="0" />
<parameter name="RGB 伽马" id="2160" flags="12889161760" default="1" value="1" />
<parameter name="RGB 输入白" id="2164" flags="12889161760" default="255" value="255" />
<parameter name="RGB 输出黑" id="2168" flags="12889161760" default="0" value="0" />
<parameter name="RGB 输出白" id="2172" flags="12889161760" default="255" value="255" />
<parameter name="红 输入黑" id="2157" flags="12889161760" default="0" value="0" />
<parameter name="红 伽马" id="2161" flags="12889161760" default="1" value="1" />
<parameter name="红 输入白" id="2165" flags="12889161760" default="255" value="255" />
<parameter name="红 输出黑" id="2169" flags="12889161760" default="0" value="0" />
<parameter name="红 输出白" id="2173" flags="12889161760" default="255" value="255" />
<parameter name="绿 输入黑" id="2158" flags="12889161760" default="0" value="0" />
<parameter name="绿 伽马" id="2162" flags="12889161760" default="1" value="1" />
<parameter name="绿 输入白" id="2166" flags="12889161760" default="255" value="255" />
<parameter name="绿 输出黑" id="2170" flags="12889161760" default="0" value="0" />
<parameter name="绿 输出白" id="2174" flags="12889161760" default="255" value="255" />
<parameter name="蓝 输入黑" id="2159" flags="12889161760" default="0" value="0" />
<parameter name="蓝 伽马" id="2163" flags="12889161760" default="1" value="1" />
<parameter name="蓝 输入白" id="2167" flags="12889161760" default="255" value="255" />
<parameter name="蓝 输出黑" id="2171" flags="12889161760" default="0" value="0" />
<parameter name="蓝 输出白" id="2175" flags="12889161760" default="255" value="255" />
<parameter name="色阶" id="2152" flags="12889161760" default="1" value="1" />
<parameter name="黑白 红" id="2180" flags="12889161760" default="40" value="40" />
<parameter name="黑白 黄" id="2181" flags="12889161760" default="60" value="60" />
<parameter name="黑白 绿" id="2182" flags="12889161760" default="40" value="40" />
<parameter name="黑白 青" id="2183" flags="12889161760" default="60" value="60" />
<parameter name="黑白 蓝" id="2184" flags="12889161760" default="20" value="20" />
<parameter name="黑白 洋红" id="2185" flags="12889161760" default="80" value="80" />
<parameter name="着色色相" id="2186" flags="12889161760" default="0" value="0" />
<parameter name="着色饱和度" id="2187" flags="12889161760" default="0" value="0" />
<parameter name="黑白混合" id="2270" flags="12889161760" default="0" value="0" />
<parameter name="黑白混色" id="2176" flags="12889161760" default="1" value="1" />
<parameter name="保持明度" id="2189" flags="12889161760" default="1" value="1" />
<parameter name="阴影 青 ↔ 红" id="2192" flags="12889161760" default="0" value="0" />
<parameter name="阴影 洋红 ↔ 绿" id="2193" flags="12889161760" default="0" value="0" />
<parameter name="阴影 黄 ↔ 蓝" id="2194" flags="12889161760" default="0" value="0" />
<parameter name="中间调 青 ↔ 红" id="2196" flags="12889161760" default="0" value="0" />
<parameter name="中间调 洋红 ↔ 绿" id="2197" flags="12889161760" default="0" value="0" />
<parameter name="中间调 黄 ↔ 蓝" id="2198" flags="12889161760" default="0" value="0" />
<parameter name="高光 青 ↔ 红" id="2200" flags="12889161760" default="0" value="0" />
<parameter name="高光 洋红 ↔ 绿" id="2201" flags="12889161760" default="0" value="0" />
<parameter name="高光 黄 ↔ 蓝" id="2202" flags="12889161760" default="0" value="0" />
<parameter name="色彩平衡" id="2188" flags="12889161760" default="1" value="1" />
<parameter name="红输出 ← 红输入" id="2276" flags="12889161760" default="1" value="1" />
<parameter name="红输出 ← 绿输入" id="2277" flags="12889161760" default="0" value="0" />
<parameter name="红输出 ← 蓝输入" id="2278" flags="12889161760" default="0" value="0" />
<parameter name="绿输出 ← 红输入" id="2280" flags="12889161760" default="0" value="0" />
<parameter name="绿输出 ← 绿输入" id="2281" flags="12889161760" default="1" value="1" />
<parameter name="绿输出 ← 蓝输入" id="2282" flags="12889161760" default="0" value="0" />
<parameter name="蓝输出 ← 红输入" id="2284" flags="12889161760" default="0" value="0" />
<parameter name="蓝输出 ← 绿输入" id="2285" flags="12889161760" default="0" value="0" />
<parameter name="蓝输出 ← 蓝输入" id="2286" flags="12889161760" default="1" value="1" />
<parameter name="保持亮度" id="2289" flags="12889161760" default="0" value="0" />
<parameter name="保持饱和度" id="2290" flags="12889161760" default="0" value="0" />
<parameter name="通道混合强度" id="2291" flags="12889161760" default="1" value="1" />
<parameter name="通道混合器" id="2288" flags="12889161760" default="1" value="1" />
<parameter name="胶片混合强度" id="2293" flags="12889161760" default="1" value="1" />
<parameter name="启用减色" id="2294" flags="12889161760" default="0" value="0" />
<parameter name="整体减色" id="2295" flags="12889161760" default="1" value="1" />
<parameter name="青色减色" id="2296" flags="12889161760" default="1" value="1" />
<parameter name="洋红减色" id="2297" flags="12889161760" default="1" value="1" />
<parameter name="黄色减色" id="2298" flags="12889161760" default="1" value="1" />
<parameter name="密度" id="2299" flags="12889161760" default="0" value="0" />
<parameter name="密度模式" id="2300" flags="12889161760" default="2" value="2" />
<parameter name="胶片亮度模型" id="2301" flags="12889161760" default="6" value="6" />
<parameter name="启用晕光" id="2302" flags="12889161760" default="0" value="0" />
<parameter name="散射半径" id="2303" flags="12889161760" default="5" value="5" />
<parameter name="染料透射" id="2304" flags="12889161760" default="0" value="0" />
<parameter name="晕光增强" id="2305" flags="12889161760" default="1" value="1" />
<parameter name="启用辉光" id="2306" flags="12889161760" default="0" value="0" />
<parameter name="辉光灵敏度" id="2307" flags="12889161760" default="50" value="50" />
<parameter name="辉光扩散" id="2308" flags="12889161760" default="30" value="30" />
<parameter name="辉光强度" id="2309" flags="12889161760" default="50" value="50" />
<parameter name="启用颗粒" id="2310" flags="12889161760" default="0" value="0" />
<parameter name="颗粒数量" id="2311" flags="12889161760" default="0" value="0" />
<parameter name="颗粒大小" id="2312" flags="12889161760" default="1" value="1" />
<parameter name="胶片响应" id="2313" flags="12889161760" default="0" value="0" />
<parameter name="颜色变化" id="2314" flags="12889161760" default="0" value="0" />
<parameter name="颗粒帧保持" id="2315" flags="12889161760" default="1" value="1" />
<parameter name="颗粒种子" id="2316" flags="12889161760" default="0" value="0" />
<parameter name="启用暗角" id="2317" flags="12889161760" default="0" value="0" />
<parameter name="暗角强度" id="2318" flags="12889161760" default="1" value="1" />
<parameter name="暗角半径" id="2319" flags="12889161760" default="50" value="50" />
<parameter name="暗角过渡" id="2320" flags="12889161760" default="0.5" value="0.5" />
<parameter name="印片外观" id="2324" flags="12889161776" default="0" value="0" />
<parameter name="印片强度" id="2325" flags="12889161760" default="1" value="1" />
<parameter name="胶片模拟" id="2292" flags="12889161760" default="1" value="1" />
<parameter name="畸变校正" id="2329" flags="12889161760" default="0" value="0" />
<parameter name="画面缩放" id="2330" flags="12889161760" default="1" value="1" />
<parameter name="光学中心 X" id="2331" flags="12889161760" default="0.5" value="0.5" />
<parameter name="光学中心 Y" id="2332" flags="12889161760" default="0.5" value="0.5" />
<parameter name="镜头畸变修复" id="2328" flags="12889161760" default="1" value="1" />
<parameter name="混合" id="10001" flags="12884901888" default="1" value="1" />
<parameter name="翻转" id="10002" flags="12889161760" default="0" value="0" />
<parameter name="输入点" id="10003" flags="12889161760" default="1" value="1" />
<parameter name="发布 OSC" id="10005" flags="8589934592" default="0" value="1" />
</filter>
</scenenode>
<aspectRatio>1</aspectRatio>
<flags>0</flags>
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>524304</baseFlags>
<parameter name="属性" id="1" flags="8589938704">
<parameter name="阴影" id="234" flags="8589938706">
<foldFlags>15</foldFlags>
</parameter>
<parameter name="颜色" id="243" flags="8589938688">
<parameter name="Hidden Channel" id="245" flags="8589934610" default="1" value="3" />
<parameter name="转换类型" id="247" flags="8590032912" default="3" value="3" />
<parameter name="PQ 峰值(尼特)" id="248" flags="8589967376" default="1000" value="1000" />
</parameter>
<parameter name="投影" id="208" flags="8589973522">
<foldFlags>131087</foldFlags>
</parameter>
<parameter name="四角" id="207" flags="8589973506">
<foldFlags>131087</foldFlags>
</parameter>
<parameter name="裁剪" id="216" flags="8589973522">
<foldFlags>131087</foldFlags>
</parameter>
</parameter>
<parameter name="对象" id="2" flags="8589938704">
<parameter name="类型" id="307" flags="12884901904" default="1" value="1" />
<parameter name="固定分辨率" id="301" flags="8589936658" default="0" value="0" />
<parameter name="固定宽度" id="302" flags="12884901910" default="3840" value="3840" />
<parameter name="固定高度" id="303" flags="12884901910" default="2160" value="2160" />
<parameter name="光圈宽度" id="312" flags="12884901906" default="3840" value="3840" />
<parameter name="光圈高度" id="313" flags="12884901906" default="2160" value="2160" />
</parameter>
</layer>
<footage name="媒体层" id="10049">
<clip name="效果源" id="10048">
<pathURL>Drop Zone.tiff</pathURL>
<missingWidth>1200</missingWidth>
<missingHeight>1200</missingHeight>
<missingDuration>0.033333333333333333</missingDuration>
<creationDuration>1</creationDuration>
<mediaID />
<flags>0</flags>
<timing in="0 1 1 0" out="0 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>524304</baseFlags>
<parameter name="属性" id="1" flags="8589938704" />
<parameter name="对象" id="2" flags="8589938704">
<parameter name="像素宽高比" id="104" flags="12884901888" default="1" value="1" />
<parameter name="帧速率" id="107" flags="8589934592" default="0" value="30" />
<parameter name="固定宽度" id="114" flags="12884901888" default="1200" value="1200" />
<parameter name="固定高度" id="115" flags="12884901888" default="1200" value="1200" />
<parameter name="使用背景颜色" id="116" flags="8589934594" default="0" value="0" />
<parameter name="背景颜色" id="117" flags="8589971458">
<foldFlags>15</foldFlags>
<parameter name="红色" id="1" flags="8589967376" default="1" value="1" />
<parameter name="绿色" id="2" flags="8589967376" default="1" value="1" />
<parameter name="蓝色" id="3" flags="8589967376" default="1" value="1" />
</parameter>
<parameter name="Missing Is Still" id="128" flags="8589934610" default="0" value="1" />
</parameter>
</clip>
<flags>0</flags>
<timing in="0 1 1 0" out="0 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>524304</baseFlags>
<parameter name="属性" id="1" flags="8589938704" />
<parameter name="对象" id="2" flags="8589938704" />
</footage>
</scene>
</ozml>
+9 -2
查看文件
@@ -4,14 +4,21 @@
正式安装目标:`~/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`。插件依赖唯一正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 Bundle ID `com.dayu.color`,滤镜 UUID `1C17B73B-F229-4C09-A434-EAF6DFF5F22A`。
两个发布入口为大鱼调色自定义检查器 `./9000`、宿主混合 `./10001`。检查器、LUT 文件与工具蒙版状态分别保存为 `DYInspectorToken`、`DYAssetState`、`DYToolDocument`;原生 NSKeyedArchive 由本工程的实际类和 Foundation 生成并回读验证。全部278个已注册原生浮点参数都在同一 filter 中保存,供自定义面板与宿主持久化访问。
两个发布入口为大鱼调色自定义检查器 `./9000`、宿主混合 `./10001`。检查器、LUT 文件与工具蒙版状态分别保存为 `DYInspectorToken`、`DYAssetState`、`DYToolDocument`;原生 NSKeyedArchive 由本工程的实际类和 Foundation 生成并回读验证。全部 285 个已注册原生浮点参数都在同一 filter 中保存,供自定义面板与宿主持久化访问。
按2026-11-02用户明确要求,删除作者和网址的两个展示菜单、Rig节点与相应发布项;生成器也停止添加这些内容,历史参考 `CopyrightRig.xml` 不再参与生成。模板顶层降为 `5.11 / 5.4.5`,有本机Color Finale同类EffectSource/FxPlug/custom参数真实样本作结构依据;移除较新且本壳未使用的3D/HDR编辑提示,保留原factory和场景节点内部版本、效果源及色彩设置。来源摘要见 `sources/Provenance.json`。这降低模板格式门槛,旧FCP仍受本程序Apple Silicon、macOS14.6及FxPlug/宿主API要求约束;未实机覆盖的版本不宣称兼容。
## 独立效果入口
- `一级调色/一级调色.moef` 默认展开一级调色。
- `HSL/HSL.moef` 默认展开 HSL 混色。
两款使用同一个 FxPlug 和原生 EffectSource。工具文档保存各自的初始模块,其余模块可通过「添加模块」和「控制面板」添加。两款均启用画面控件,只发布 `./9000` 自定义检查器。模板无版权菜单、网址或独立混合滑块。整合版保留原路径和发布入口。安装包将三个同名模板文件夹放在「效果 → 大鱼调色」分类下,共用品牌预览图。
生成入口:
```sh
python3 tools/build_template.py --output /绝对路径/大鱼调色.moef
python3 tools/build_template.py --starters --output /绝对路径/大鱼调色.moef
```
工程模型有变更时,先审查变更,再加 `--refresh-model` 重新导出实际注册表与自有归档。它只编译并执行短时命令行元数据工具,仅用于本工程的参数元数据导出。既有输出必须明确加 `--overwrite`;普通重建直接复用版本化原始归档并核对模型源码哈希,以保持模板字节稳定。
+13 -3
查看文件
@@ -3710,7 +3710,7 @@
}
],
"sourceSHA256": {
"template/tools/dump_model.mm": "04e04446aa351d774913bc25b06512fefe7969bdf4c6e471a91f1e9d6c4fc3b5",
"template/tools/dump_model.mm": "4e93d3790803cc5d91ae4de1a6f3e0c72626d7930ec013d70753b9c45b26be21",
"大鱼调色/Plugin/DYCSTTypes.h": "ed5ba7e7ae35d1bba10e80a81184fa26b1f7eb582e47b2e45c3edd294889c76a",
"大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157",
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
@@ -3720,12 +3720,22 @@
"大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
"大鱼调色/Plugin/DYModel.mm": "e5bdf3177e164c0b97e535be7e6d14ea56d49f3f74c3622078374e7a9597d2c1",
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
"大鱼调色/Plugin/DYToolState.h": "bf22a9c1b29afaa6d411fae48ffd7de919947af1c626cc5d491218dd8065b293",
"大鱼调色/Plugin/DYToolState.mm": "ed99f24cceef8bbad66c562f027acd7a22b7d20f4386e04370fde2bb01f43f8c",
"大鱼调色/Plugin/DYToolState.h": "83e54959fe6161dee7a3a9c3afec7ca0872b52ad9c0fa286e7497a4a759f8e2f",
"大鱼调色/Plugin/DYToolState.mm": "fd752f21967e4761af91c1e3673dd1419f26c288509d2cf1f078733072e15a29",
"大鱼调色/Plugin/DYUniforms.h": "4901446fa6b2a6987a6a137baa458df70f5e25a1e64fdb5c502f765b20edc0c0",
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
"大鱼调色/Plugin/SpiderCore/DYColorMath.h": "bdd6278e17ff4208ad94a8b0e834c817c0a3475f205dd79898e8fd88e84a19c9",
"大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp": "81ecf1f0bae4030615144c7cd7ca492f93f2d718ff9e45da8242f97848e3d754"
},
"starterArchives": {
"hsl": {
"9000": "AAAAAAAAAkAqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEBgGJwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAacLDBMbHB0jVSRudWxs0w0ODxARElVmb2xkc1ZzY2hlbWFWJGNsYXNzgAIQAoAG0xQVDxYYGldOUy5rZXlzWk5TLm9iamVjdHOhF4ADoRmABIAFU2hzbAjSHh8gIVokY2xhc3NuYW1lWCRjbGFzc2VzXE5TRGljdGlvbmFyeaIgIlhOU09iamVjdNIeHyQlXxAQRFlJbnNwZWN0b3JUb2tlbqImIl8QEERZSW5zcGVjdG9yVG9rZW4ACAARABoAJAApADIANwBJAEwAWABaAGIAaABvAHUAfACDAIUAhwCJAJAAmACjAKUApwCpAKsArQCxALIAtwDCAMsA2ADbAOQA6QD8AP8AAAAAAAACAQAAAAAAAAAnAAAAAAAAAAAAAAAAAAABEggACAARABoAJAApADIANwBJAE4AWwBtAG8AcQB1AHsB/wAAAAAAAAIBAAAAAAAAABAAAAAAAAAAAAAAAAAAAAIAAA==",
"9002": "AAAAAAAAA68qYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEC72JwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAa8QHgsMESEiIyQlJicrMUJDREVGR0hJSktMTU5PUFNUV1UkbnVsbNINDg8QWGRvY3VtZW50ViRjbGFzc4ACgB3TEhMOFBogV05TLmtleXNaTlMub2JqZWN0c6UVFhcYGYADgASABYAGgAelGxwdHh+ACIAJgAuAG4AcgApbc3RhcnRlclRvb2xZYmFzZU1hc2tzW3JlbW92ZWRCYXNlVnNjaGVtYVZsYXllcnNTaHNs0xITDigpIKCggArSLC0uL1okY2xhc3NuYW1lWCRjbGFzc2VzXE5TRGljdGlvbmFyeaIuMFhOU09iamVjdNITDjJBrjM0NTY3ODk6Ozw9Pj9AgAyADYAOgA+AEIARgBKAE4AUgBWAFoAXgBiAGYAaV3ByaW1hcnlWc3BpZGVyVGJhc2VUc2tpblRsb29rVWN1cnZlV2dyYWRpbmdZcHJpbWFyaWVzVmxldmVsc1pibGFja3doaXRlV2JhbGFuY2VVbWl4ZXJUZmlsbVRsZW5z0iwtUVJXTlNBcnJheaJRMBAB0hMOVUGggBrSLC1YWV5EWVRvb2xEb2N1bWVudKJaMF5EWVRvb2xEb2N1bWVudAAIABEAGgAkACkAMgA3AEkATABYAFoAewCBAIYAjwCWAJgAmgChAKkAtAC6ALwAvgDAAMIAxADKAMwAzgDQANIA1ADWAOIA7AD4AP8BBgEKAREBEgETARUBGgElAS4BOwE+AUcBTAFbAV0BXwFhAWMBZQFnAWkBawFtAW8BcQFzAXUBdwF5AYEBiAGNAZIBlwGdAaUBrwG2AcEByQHPAdQB2QHeAeYB6QHrAfAB8QHzAfgCBwIKAAAAAAAAAgEAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAhkIAAgAEQAaACQAKQAyADcASQBOAFsAbQBvAHEAdQB7A24AAAAAAAACAQAAAAAAAAAQAAAAAAAAAAAAAAAAAAADbwA="
},
"primary": {
"9000": "AAAAAAAAAkQqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEBhGJwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAacLDBMbHB0jVSRudWxs0w0ODxARElVmb2xkc1ZzY2hlbWFWJGNsYXNzgAIQAoAG0xQVDxYYGldOUy5rZXlzWk5TLm9iamVjdHOhF4ADoRmABIAFV3ByaW1hcnkI0h4fICFaJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiICJYTlNPYmplY3TSHh8kJV8QEERZSW5zcGVjdG9yVG9rZW6iJiJfEBBEWUluc3BlY3RvclRva2VuAAgAEQAaACQAKQAyADcASQBMAFgAWgBiAGgAbwB1AHwAgwCFAIcAiQCQAJgAowClAKcAqQCrAK0AtQC2ALsAxgDPANwA3wDoAO0BAAEDAAAAAAAAAgEAAAAAAAAAJwAAAAAAAAAAAAAAAAAAARYIAAgAEQAaACQAKQAyADcASQBOAFsAbQBvAHEAdQB7AgMAAAAAAAACAQAAAAAAAAAQAAAAAAAAAAAAAAAAAAACBAA=",
"9002": "AAAAAAAAA68qYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEC72JwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAa8QHgsMESEiIyQlJicrMUJDREVGR0hJSktMTU5PUFNUV1UkbnVsbNINDg8QWGRvY3VtZW50ViRjbGFzc4ACgB3TEhMOFBogV05TLmtleXNaTlMub2JqZWN0c6UVFhcYGYADgASABYAGgAelGxwdHh+ACIAJgAuAG4AcgApbc3RhcnRlclRvb2xZYmFzZU1hc2tzW3JlbW92ZWRCYXNlVnNjaGVtYVZsYXllcnNXcHJpbWFyedMSEw4oKSCgoIAK0iwtLi9aJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiLjBYTlNPYmplY3TSEw4yQa4zNDU2Nzg5Ojs8PT4/QIAMgA2ADoAPgBCAEYASgBOAFIAVgBaAF4AYgBmAGlZzcGlkZXJUYmFzZVRza2luVGxvb2tTaHNsVWN1cnZlV2dyYWRpbmdZcHJpbWFyaWVzVmxldmVsc1pibGFja3doaXRlV2JhbGFuY2VVbWl4ZXJUZmlsbVRsZW5z0iwtUVJXTlNBcnJheaJRMBAB0hMOVUGggBrSLC1YWV5EWVRvb2xEb2N1bWVudKJaMF5EWVRvb2xEb2N1bWVudAAIABEAGgAkACkAMgA3AEkATABYAFoAewCBAIYAjwCWAJgAmgChAKkAtAC6ALwAvgDAAMIAxADKAMwAzgDQANIA1ADWAOIA7AD4AP8BBgEOARUBFgEXARkBHgEpATIBPwFCAUsBUAFfAWEBYwFlAWcBaQFrAW0BbwFxAXMBdQF3AXkBewF9AYQBiQGOAZMBlwGdAaUBrwG2AcEByQHPAdQB2QHeAeYB6QHrAfAB8QHzAfgCBwIKAAAAAAAAAgEAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAhkIAAgAEQAaACQAKQAyADcASQBOAFsAbQBvAHEAdQB7A24AAAAAAAACAQAAAAAAAAAQAAAAAAAAAAAAAAAAAAADbwA="
}
}
}
+10 -1
查看文件
@@ -18,7 +18,16 @@ static NSString *archive(id object) {
return [carrier base64EncodedStringWithOptions:0];
}
int main(void){@autoreleasepool{
NSDictionary *out=@{@"parameters":DYDescriptors(),@"archivesBase64":@{@"9000":archive([[[DYInspectorToken alloc]init]autorelease]),@"9001":archive([[[DYAssetState alloc]init]autorelease]),@"9002":archive([[[DYToolDocument alloc]init]autorelease])}};
NSMutableDictionary *starterArchives=[NSMutableDictionary dictionary];
for(NSString *type in @[@"primary",@"hsl"]){
DYInspectorToken *inspector=[[[DYInspectorToken alloc]init]autorelease];
inspector.folds=@{type:@NO};
DYToolDocument *tools=[[[DYToolDocument alloc]init]autorelease];
tools.document=DYInitialToolDocument(type);
if(![tools.document[@"starterTool"] isEqual:type]||tools.document[@"removedBase"]==nil)return 2;
starterArchives[type]=@{@"9000":archive(inspector),@"9002":archive(tools)};
}
NSDictionary *out=@{@"starterArchives":starterArchives,@"parameters":DYDescriptors(),@"archivesBase64":@{@"9000":archive([[[DYInspectorToken alloc]init]autorelease]),@"9001":archive([[[DYAssetState alloc]init]autorelease]),@"9002":archive([[[DYToolDocument alloc]init]autorelease])}};
NSError *error=nil;NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:&error];
if(!json){fprintf(stderr,"Could not export our model metadata\n");return 2;}fwrite(json.bytes,1,json.length,stdout);return 0;
}}
+597
查看文件
@@ -0,0 +1,597 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ozxmlscene>
<ozml version="5.11">
<displayversion>5.4.5</displayversion>
<factory id="1" uuid="46c844a813d311d8a438000a95af9f7e">
<description>Channel</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<factory id="2" uuid="65cb4dc9d4504fa281921f5f751fba06">
<description>小组件</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<factory id="3" uuid="66fc0d6af6a911d6a7a7000393670732">
<description>图像</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<factory id="4" uuid="7d468273c013498e9806a0d7bc32fddf">
<description>项目</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<factory id="5" uuid="deca4859b16011d7a12d0003936f6f92">
<description>ProPlugin 滤镜</description>
<manufacturer>Apple</manufacturer>
<version>1</version>
</factory>
<build />
<description />
<canvas>
<layout>1</layout>
<activeView>0</activeView>
</canvas>
<viewer subview="0">
<resolutionMode>0</resolutionMode>
<dynamicResolution>0</dynamicResolution>
<viewmode>0</viewmode>
<overlayOptions>92956</overlayOptions>
<oscOptions>30</oscOptions>
<compensateAspectRatio>1</compensateAspectRatio>
<renderFields>0</renderFields>
<showMotionBlur>0</showMotionBlur>
<showFrameBlending>1</showFrameBlending>
<showLighting>1</showLighting>
<showShadows>1</showShadows>
<showReflection>1</showReflection>
<showDepthOfField>0</showDepthOfField>
<renderFullView>0</renderFullView>
<renderQuality>2</renderQuality>
<textRenderQuality>2</textRenderQuality>
<showHighQualityResampling>0</showHighQualityResampling>
<showShapeAntialiasing>1</showShapeAntialiasing>
<show3DIntersectionAntialiasing>0</show3DIntersectionAntialiasing>
<cameraType>0</cameraType>
<cameraName>活跃的摄像机</cameraName>
<mirrorHMD>0</mirrorHMD>
<panZoom camera="0" zoom="0.43564814329147339" panX="726" panY="3" mode="2" centered="1" />
<panZoom camera="1" zoom="0.15078124403953552" panX="19" panY="129" mode="2" centered="1" />
</viewer>
<projectPanel>
<layersPreviewColumn>1</layersPreviewColumn>
<layersOpacityColumn>0</layersOpacityColumn>
<layersBlendColumn>0</layersBlendColumn>
<displayMasks>1</displayMasks>
<displayBehaviors>1</displayBehaviors>
<displayEffects>1</displayEffects>
<layersVerticalZoom>1.7999999523162842</layersVerticalZoom>
<mediaPreviewColumn>1</mediaPreviewColumn>
<mediaTypeColumn>1</mediaTypeColumn>
<mediaDurationColumn>1</mediaDurationColumn>
<mediaInUseColumn>1</mediaInUseColumn>
<mediaFrameSizeColumn>1</mediaFrameSizeColumn>
<mediaCompressorColumn>1</mediaCompressorColumn>
<mediaDepthColumn>1</mediaDepthColumn>
<mediaFrameRateColumn>1</mediaFrameRateColumn>
<mediaDataRateColumn>1</mediaDataRateColumn>
<mediaAudioRateColumn>1</mediaAudioRateColumn>
<mediaAudioFormatColumn>1</mediaAudioFormatColumn>
<mediaFileSizeColumn>1</mediaFileSizeColumn>
<mediaFileCreatedColumn>1</mediaFileCreatedColumn>
<mediaDileModifiedColumn>1</mediaDileModifiedColumn>
<mediaVerticalZoom>1.7999999523162842</mediaVerticalZoom>
</projectPanel>
<timeline>
<displayVideo>1</displayVideo>
<displayAudio>0</displayAudio>
<displayKeyframes>1</displayKeyframes>
<displayMasks>1</displayMasks>
<displayBehaviors>1</displayBehaviors>
<displayEffects>1</displayEffects>
<videoVerticalZoom>2.2222222222222223</videoVerticalZoom>
<audioVerticalZoom>1.5555555820465088</audioVerticalZoom>
<displayRange in="-441795416 1729492187 3 0" out="10265448055 1000000000 3 0" />
</timeline>
<curveeditor>
<autozoom>0</autozoom>
<snapping>0</snapping>
<displayAudioWaveform>0</displayAudioWaveform>
<lockKeyframesInTime>0</lockKeyframesInTime>
<displayRange in="-441795416 1729492187 3 0" out="10265448055 1000000000 3 0" />
<currentviewvolume originx="-0.25544805540078452" originy="-62.5" width="10.520896110000001" height="125" />
<snapshotChannels>0</snapshotChannels>
</curveeditor>
<inspector>
<collapseState id="./1/100" state="1" />
<collapseState id="./1/200" state="1" />
<collapseState id="./1/344" state="1" />
</inspector>
<scene>
<sceneSettings>
<width>3840</width>
<height>2160</height>
<duration>600</duration>
<shouldOverrideFCDuration>0</shouldOverrideFCDuration>
<frameRate>60</frameRate>
<NTSC>1</NTSC>
<pixelAspectRatio>1</pixelAspectRatio>
<workingGamut>0</workingGamut>
<viewGamut>-1</viewGamut>
<optimizeForDisplay>0</optimizeForDisplay>
<backgroundColor red="0" green="0" blue="0" alpha="0" />
<audioChannels>2</audioChannels>
<audioBitsPerSample>32</audioBitsPerSample>
<fieldRenderingMode>0</fieldRenderingMode>
<motionBlurSamples>8</motionBlurSamples>
<motionBlurDuration>1</motionBlurDuration>
<sharpScaling>0</sharpScaling>
<startTimecode>0</startTimecode>
<presetPath>/Applications/Motion.app/Contents/Resources/zh_CN.lproj/Presets/Project/4K - Ultra HD.preset</presetPath>
<backgroundMode>0</backgroundMode>
<reflectionRecursionLimit>2</reflectionRecursionLimit>
<glyphOSCMode>0</glyphOSCMode>
<animateFlag>0</animateFlag>
<parameterColorSpaceID>3</parameterColorSpaceID>
<savePreviewMovie>0</savePreviewMovie>
</sceneSettings>
<publishSettings>
<version>2</version>
<target object="10060" channel="./9000" name="大鱼调色" />
</publishSettings>
<currentFrame>0 1 1 0</currentFrame>
<currentObject>10000</currentObject>
<timeRange offset="0 1 1 0" duration="1201200 120000 1 0" />
<playRange offset="0 1 1 0" duration="1201200 120000 1 0" />
<flags>129</flags>
<audioTracks>0</audioTracks>
<timemarkerset />
<guideset />
<curvesets selected="1" />
<scenenode name="项目" id="10000" factoryID="4" version="5">
<scenenode name="小组件" id="10002" factoryID="2" version="5">
<flags>0</flags>
<timing in="0 1 1 0" out="-2002 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>16</baseFlags>
<parameter name="属性" id="1" flags="8589938704" />
<parameter name="对象" id="2" flags="8589938704">
<parameter name="选项" id="103" flags="8589938688" />
<parameter name="Hidden" id="102" flags="8589934608" default="0" value="1" />
<parameter name="快照" id="101" flags="8589938706" />
<parameter name="小组件" id="100" flags="8589934608" default="1.7777777777777777" value="1.7777777777777777" />
</parameter>
</scenenode>
<flags>0</flags>
<timing in="0 1 1 0" out="-2002 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>268435473</baseFlags>
<parameter name="属性" id="1" flags="8589938704" />
<parameter name="对象" id="2" flags="8589938704" />
</scenenode>
<layer name="群组 1" id="10047">
<scenenode name="效果源" id="10050" factoryID="3" version="5">
<validTracks>1</validTracks>
<aspectRatio>0</aspectRatio>
<flags>0</flags>
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
<foldFlags>16384</foldFlags>
<baseFlags>524304</baseFlags>
<parameter name="属性" id="1" flags="8589938704">
<parameter name="电影效果" id="344" flags="8589938706">
<foldFlags>131076</foldFlags>
<parameter name="景深" id="346" flags="8589934608" default="1.3999999999999999" value="2" />
<parameter name="焦点" id="348" flags="8589938706">
<foldFlags>15</foldFlags>
</parameter>
</parameter>
<parameter name="颜色" id="243" flags="8589938688">
<parameter name="Hidden Channel" id="245" flags="8589934610" default="1" value="3" />
<parameter name="转换类型" id="247" flags="8590032912" default="3" value="3" />
<parameter name="PQ 峰值(尼特)" id="248" flags="8589967376" default="1000" value="1000" />
</parameter>
<parameter name="媒体" id="324" flags="8589938704">
<parameter name="源媒体" id="300" flags="81604444176" default="10048" value="10048" />
<parameter name="源媒体" id="325" flags="8590000146" />
</parameter>
<parameter name="页码" id="301" flags="8589934610" default="1" value="1" />
<parameter name="重新定时值" id="304" flags="8590066066" default="1" value="1" />
<parameter name="重新定时值缓存" id="319" flags="8590065810" default="1" value="1" />
</parameter>
<parameter name="对象" id="2" flags="8589938704">
<parameter name="拖放区" id="311" flags="8589934738" default="0" value="1" />
<parameter name="类型" id="321" flags="8590000146" default="0" value="3" />
<parameter name="移动" id="326" flags="77309415442">
<foldFlags>15</foldFlags>
</parameter>
<parameter name="缩放" id="327" flags="77309415442">
<foldFlags>15</foldFlags>
</parameter>
<parameter name="填充不透明" id="328" flags="8589934608" default="0" value="0" />
<parameter name="填充颜色" id="329" flags="8589938704">
<foldFlags>15</foldFlags>
</parameter>
<parameter name="清除" id="315" flags="8590000144" default="0" value="0" />
<parameter name="宽度" id="313" flags="8589934610" default="1" value="3840" />
<parameter name="高度" id="314" flags="8589934610" default="1" value="2160" />
</parameter>
<filter name="大鱼调色" id="10060" factoryID="5" pluginUUID="1C17B73B-F229-4C09-A434-EAF6DFF5F22A" pluginVersion="0" pluginName="大鱼调色" pluginDynamicParams="0">
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
<baseFlags>8589934608</baseFlags>
<parameter name="大鱼调色" id="9000" flags="12884901888">
<numberOfKeypoints>0</numberOfKeypoints>
<defaultVal>*********YEeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-V47kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OQ91-AP5-oXJGFiRKlgokoC1l*F2ZJaPqlYQpNnMqVZPK3K74BgMLBnU*6E*c*4olEJ1lMM4ZRCImtfNLZnKYtH9axWOaJXR5CV3s*1cFa*-6*3Jr-mOKpVQbY6oVsT603O74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW607MHZBDMadZMrHG5VwY7JwE22FNGKtnQ4JXR4xmJ4xfNKuW7W7T2--2KIZiQr-ZMrFjQZFjOqJi**U*2E*O*0E*8E*m*1Q*GE-A*3U*KU-W*4U*Pk-p*5k*Uk03*6Q*WE0E*7U*ck0Z*8Q*eE0f*8o*hE0q*9g*lU1D*Bk*rk1c*Co-**21*********U2*********7k*******************FM6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*UA********0*E*********E*******************0-**</defaultVal>
<dataValue>*********YEeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-V47kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OQ91-AP5-oXJGFiRKlgokoC1l*F2ZJaPqlYQpNnMqVZPK3K74BgMLBnU*6E*c*4olEJ1lMM4ZRCImtfNLZnKYtH9axWOaJXR5CV3s*1cFa*-6*3Jr-mOKpVQbY6oVsT603O74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW607MHZBDMadZMrHG5VwY7JwE22FNGKtnQ4JXR4xmJ4xfNKuW7W7T2--2KIZiQr-ZMrFjQZFjOqJi**U*2E*O*0E*8E*m*1Q*GE-A*3U*KU-W*4U*Pk-p*5k*Uk03*6Q*WE0E*7U*ck0Z*8Q*eE0f*8o*hE0q*9g*lU1D*Bk*rk1c*Co-**21*********U2*********7k*******************FM6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*UA********0*E*********E*******************0-**</dataValue>
</parameter>
<parameter name="LUT 文件" id="9001" flags="12889161776">
<numberOfKeypoints>0</numberOfKeypoints>
<defaultVal>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</defaultVal>
<dataValue>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</dataValue>
</parameter>
<parameter name="工具与蒙版" id="9002" flags="12889161776">
<numberOfKeypoints>0</numberOfKeypoints>
<defaultVal>*********uweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl20vq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OwE5UgA2G2W6mEZ7WQfAI71F2J4FoV7GYhAHItDI3BIJpIYPbJgPB6B1UwEK4FjMrJhNKtoJWFXP43nQs*0U-rH2VAC3-cUJotH9ahZSLBOHZAiPq7eNKBoQuIJ3VQM4M*1U*G*-M*4U*SZ4lkR5Vy*06*7U*i*4s*QU*dPQrFVQbFZQZFjPqlNMa3nNIpVQqhnKr7ZPKxqNKF0MLBZJbBXO4JhMJNgMLZZQbBLQ57dPK3mSRAG2ksc8G0Uc6*8oWkh9WxO74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW9X-MHZBDMadZMrHG2ksmEOsnB1IqBnUtCXgwDHszE6*AU*q*1c*DU-0*2M*GU-C*36*JU-O*3s*MU-a*4ZNnQ4ZYNL7IMa3nNJFnOqZiJ4ljPqhHO5BgJKBpQbNZJqRmMKFdPaRNQ57dPK3mOKJnJalZRaJgQpdWP43XOrRcOLFZJq7VP43iMqJJPKZsNL7INaZgPJFgNKtnoWkhIJ7LHZB-Qb7VSO7FA-*-oVACJI4UU-fG90pMKJt2KJFjPql2PqBpPKJiR87OA3t2KJFjPql2PqBpPKJiR**6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*Sk0-*6M*Xk0K*7U*aU0V*8Y*h*0u*9k*jU1**A6*l*18*Ak*nU1E*B6*p*1K*C6*v*1s*Dw--U2C*FI-3U2L*FY-5U2d*H6-Dk30*Ig-I*3T*K2-Mk3Z*KQ-OE3f*Ko-Pk3l*LA-RE3r*LY-Sk3x*ME-WE4C*NA-Zk4R*OI-fk4q*Q2-mE5D*RE-qE5S*SM-uE5f*T*-wE5n*TU0-k68*********U2*********Kk*******************VY6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*qs********0*E*********E*******************1Pk*</defaultVal>
<dataValue>*********uweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl20vq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OwE5UgA2G2W6mEZ7WQfAI71F2J4FoV7GYhAHItDI3BIJpIYPbJgPB6B1UwEK4FjMrJhNKtoJWFXP43nQs*0U-rH2VAC3-cUJotH9ahZSLBOHZAiPq7eNKBoQuIJ3VQM4M*1U*G*-M*4U*SZ4lkR5Vy*06*7U*i*4s*QU*dPQrFVQbFZQZFjPqlNMa3nNIpVQqhnKr7ZPKxqNKF0MLBZJbBXO4JhMJNgMLZZQbBLQ57dPK3mSRAG2ksc8G0Uc6*8oWkh9WxO74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW9X-MHZBDMadZMrHG2ksmEOsnB1IqBnUtCXgwDHszE6*AU*q*1c*DU-0*2M*GU-C*36*JU-O*3s*MU-a*4ZNnQ4ZYNL7IMa3nNJFnOqZiJ4ljPqhHO5BgJKBpQbNZJqRmMKFdPaRNQ57dPK3mOKJnJalZRaJgQpdWP43XOrRcOLFZJq7VP43iMqJJPKZsNL7INaZgPJFgNKtnoWkhIJ7LHZB-Qb7VSO7FA-*-oVACJI4UU-fG90pMKJt2KJFjPql2PqBpPKJiR87OA3t2KJFjPql2PqBpPKJiR**6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*Sk0-*6M*Xk0K*7U*aU0V*8Y*h*0u*9k*jU1**A6*l*18*Ak*nU1E*B6*p*1K*C6*v*1s*Dw--U2C*FI-3U2L*FY-5U2d*H6-Dk30*Ig-I*3T*K2-Mk3Z*KQ-OE3f*Ko-Pk3l*LA-RE3r*LY-Sk3x*ME-WE4C*NA-Zk4R*OI-fk4q*Q2-mE5D*RE-qE5S*SM-uE5f*T*-wE5n*TU0-k68*********U2*********Kk*******************VY6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*qs********0*E*********E*******************1Pk*</dataValue>
</parameter>
<parameter name="相机输入" id="2013" flags="12889161760" default="0" value="0" />
<parameter name="旧版输入强度" id="2014" flags="12889161760" default="1" value="1" />
<parameter name="CST 配置版本" id="2236" flags="12889161760" default="0" value="0" />
<parameter name="输入转换启用" id="2241" flags="12889161760" default="1" value="1" />
<parameter name="输入曲线" id="2237" flags="12889161776" default="28" value="28" />
<parameter name="输入色域" id="2238" flags="12889161776" default="27" value="27" />
<parameter name="工作曲线" id="2239" flags="12889161776" default="10" value="10" />
<parameter name="工作色域" id="2240" flags="12889161776" default="16" value="16" />
<parameter name="CST 混合" id="2269" flags="12889161760" default="1" value="1" />
<parameter name="一级调色启用" id="2242" flags="12889161760" default="1" value="1" />
<parameter name="一级曝光" id="2247" flags="12889161760" default="0" value="0" />
<parameter name="色彩平衡方向" id="2248" flags="12889161760" default="0" value="0" />
<parameter name="色彩平衡强度" id="2249" flags="12889161760" default="0" value="0" />
<parameter name="一级饱和度" id="2250" flags="12889161760" default="1" value="1" />
<parameter name="一级对比度" id="2251" flags="12889161760" default="0" value="0" />
<parameter name="对比度轴心" id="2252" flags="12889161760" default="0" value="0" />
<parameter name="高光对比度" id="2253" flags="12889161760" default="0" value="0" />
<parameter name="高光轴心" id="2254" flags="12889161760" default="0" value="0" />
<parameter name="阴影对比度" id="2255" flags="12889161760" default="0" value="0" />
<parameter name="阴影轴心" id="2256" flags="12889161760" default="0" value="0" />
<parameter name="白点" id="2257" flags="12889161760" default="1" value="1" />
<parameter name="肩部压缩" id="2258" flags="12889161760" default="0.5" value="0.5" />
<parameter name="一级高光" id="2259" flags="12889161760" default="0" value="0" />
<parameter name="一级中间调" id="2260" flags="12889161760" default="0" value="0" />
<parameter name="一级阴影" id="2261" flags="12889161760" default="0" value="0" />
<parameter name="黑点" id="2262" flags="12889161760" default="0" value="0" />
<parameter name="趾部压缩" id="2263" flags="12889161760" default="0.5" value="0.5" />
<parameter name="色度混合" id="2264" flags="12889161760" default="0.5" value="0.5" />
<parameter name="旁路一级曝光" id="2265" flags="12889161760" default="0" value="0" />
<parameter name="旁路一级色彩" id="2266" flags="12889161760" default="0" value="0" />
<parameter name="旁路一级对比" id="2267" flags="12889161760" default="0" value="0" />
<parameter name="旁路一级影调" id="2268" flags="12889161760" default="0" value="0" />
<parameter name="输出转换启用" id="2243" flags="12889161760" default="1" value="1" />
<parameter name="输出曲线" id="2244" flags="12889161776" default="1002" value="1002" />
<parameter name="输出色域" id="2245" flags="12889161776" default="22" value="22" />
<parameter name="自动色调映射" id="2246" flags="12889161776" default="0" value="1" />
<parameter name="输入转换 / CST" id="2033" flags="12889161760" default="1" value="1" />
<parameter name="曝光" id="2000" flags="12889161760" default="0" value="0" />
<parameter name="曝光 启用" id="2020" flags="12889161760" default="1" value="1" />
<parameter name="对比度" id="2001" flags="12889161760" default="0" value="0" />
<parameter name="对比度 启用" id="2021" flags="12889161760" default="1" value="1" />
<parameter name="高光" id="2002" flags="12889161760" default="0" value="0" />
<parameter name="高光 启用" id="2022" flags="12889161760" default="1" value="1" />
<parameter name="阴影" id="2003" flags="12889161760" default="0" value="0" />
<parameter name="阴影 启用" id="2023" flags="12889161760" default="1" value="1" />
<parameter name="白色色阶" id="2004" flags="12889161760" default="0" value="0" />
<parameter name="白色色阶 启用" id="2024" flags="12889161760" default="1" value="1" />
<parameter name="黑色色阶" id="2005" flags="12889161760" default="0" value="0" />
<parameter name="黑色色阶 启用" id="2025" flags="12889161760" default="1" value="1" />
<parameter name="色温" id="2006" flags="12889161760" default="0" value="0" />
<parameter name="色温 启用" id="2026" flags="12889161760" default="1" value="1" />
<parameter name="色调" id="2007" flags="12889161760" default="0" value="0" />
<parameter name="色调 启用" id="2027" flags="12889161760" default="1" value="1" />
<parameter name="饱和度" id="2008" flags="12889161760" default="0" value="0" />
<parameter name="饱和度 启用" id="2028" flags="12889161760" default="1" value="1" />
<parameter name="鲜艳度" id="2009" flags="12889161760" default="0" value="0" />
<parameter name="鲜艳度 启用" id="2029" flags="12889161760" default="1" value="1" />
<parameter name="纹理" id="2010" flags="12889161760" default="0" value="0" />
<parameter name="纹理 启用" id="2030" flags="12889161760" default="1" value="1" />
<parameter name="清晰度" id="2011" flags="12889161760" default="0" value="0" />
<parameter name="清晰度 启用" id="2031" flags="12889161760" default="1" value="1" />
<parameter name="去朦胧" id="2012" flags="12889161760" default="0" value="0" />
<parameter name="去朦胧 启用" id="2032" flags="12889161760" default="1" value="1" />
<parameter name="复制时自动调色" id="8800" flags="12889161776" default="0" value="0" />
<parameter name="一级调色总开关" id="2271" flags="12889161760" default="1" value="1" />
<parameter name="蜘蛛盘混合" id="2273" flags="12889161760" default="1" value="1" />
<parameter name="蜘蛛盘校色仪" id="2272" flags="12889161760" default="1" value="1" />
<parameter name="基础调色" id="2034" flags="12889161760" default="1" value="1" />
<parameter name="白平衡与颜色" id="2035" flags="12889161760" default="1" value="1" />
<parameter name="保护程度" id="2117" flags="12889161760" default="60" value="60" />
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
<parameter name="风格 3 启用" id="2041" flags="12889161760" default="1" value="1" />
<parameter name="风格 3 强度" id="2017" flags="12889161760" default="1" value="1" />
<parameter name="风格 4 启用" id="2042" flags="12889161760" default="1" value="1" />
<parameter name="风格 4 强度" id="2018" flags="12889161760" default="1" value="1" />
<parameter name="风格 5 启用" id="2043" flags="12889161760" default="1" value="1" />
<parameter name="风格 5 强度" id="2019" flags="12889161760" default="1" value="1" />
<parameter name="风格 LUT" id="2036" flags="12889161760" default="1" value="1" />
<parameter name="主曲线 阴影" id="2046" flags="12889161760" default="0" value="0" />
<parameter name="主曲线 暗部" id="2047" flags="12889161760" default="0" value="0" />
<parameter name="主曲线 亮部" id="2048" flags="12889161760" default="0" value="0" />
<parameter name="主曲线 高光" id="2049" flags="12889161760" default="0" value="0" />
<parameter name="红曲线 阴影" id="2050" flags="12889161760" default="0" value="0" />
<parameter name="红曲线 高光" id="2051" flags="12889161760" default="0" value="0" />
<parameter name="绿曲线 阴影" id="2052" flags="12889161760" default="0" value="0" />
<parameter name="绿曲线 高光" id="2053" flags="12889161760" default="0" value="0" />
<parameter name="蓝曲线 阴影" id="2054" flags="12889161760" default="0" value="0" />
<parameter name="蓝曲线 高光" id="2055" flags="12889161760" default="0" value="0" />
<parameter name="主曲线 点1 X" id="2056" flags="12889161760" default="-1" value="-1" />
<parameter name="主曲线 点2 X" id="2057" flags="12889161760" default="-1" value="-1" />
<parameter name="主曲线 点3 X" id="2058" flags="12889161760" default="-1" value="-1" />
<parameter name="主曲线 点4 X" id="2059" flags="12889161760" default="-1" value="-1" />
<parameter name="红曲线 点1 X" id="2060" flags="12889161760" default="-1" value="-1" />
<parameter name="红曲线 点2 X" id="2061" flags="12889161760" default="-1" value="-1" />
<parameter name="绿曲线 点1 X" id="2062" flags="12889161760" default="-1" value="-1" />
<parameter name="绿曲线 点2 X" id="2063" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝曲线 点1 X" id="2064" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝曲线 点2 X" id="2065" flags="12889161760" default="-1" value="-1" />
<parameter name="主 扩展点1 偏移" id="2204" flags="12889161760" default="0" value="0" />
<parameter name="主 扩展点1 X" id="2208" flags="12889161760" default="-1" value="-1" />
<parameter name="主 扩展点2 偏移" id="2205" flags="12889161760" default="0" value="0" />
<parameter name="主 扩展点2 X" id="2209" flags="12889161760" default="-1" value="-1" />
<parameter name="主 扩展点3 偏移" id="2206" flags="12889161760" default="0" value="0" />
<parameter name="主 扩展点3 X" id="2210" flags="12889161760" default="-1" value="-1" />
<parameter name="主 扩展点4 偏移" id="2207" flags="12889161760" default="0" value="0" />
<parameter name="主 扩展点4 X" id="2211" flags="12889161760" default="-1" value="-1" />
<parameter name="红 扩展点1 偏移" id="2212" flags="12889161760" default="0" value="0" />
<parameter name="红 扩展点1 X" id="2216" flags="12889161760" default="-1" value="-1" />
<parameter name="红 扩展点2 偏移" id="2213" flags="12889161760" default="0" value="0" />
<parameter name="红 扩展点2 X" id="2217" flags="12889161760" default="-1" value="-1" />
<parameter name="红 扩展点3 偏移" id="2214" flags="12889161760" default="0" value="0" />
<parameter name="红 扩展点3 X" id="2218" flags="12889161760" default="-1" value="-1" />
<parameter name="红 扩展点4 偏移" id="2215" flags="12889161760" default="0" value="0" />
<parameter name="红 扩展点4 X" id="2219" flags="12889161760" default="-1" value="-1" />
<parameter name="绿 扩展点1 偏移" id="2220" flags="12889161760" default="0" value="0" />
<parameter name="绿 扩展点1 X" id="2224" flags="12889161760" default="-1" value="-1" />
<parameter name="绿 扩展点2 偏移" id="2221" flags="12889161760" default="0" value="0" />
<parameter name="绿 扩展点2 X" id="2225" flags="12889161760" default="-1" value="-1" />
<parameter name="绿 扩展点3 偏移" id="2222" flags="12889161760" default="0" value="0" />
<parameter name="绿 扩展点3 X" id="2226" flags="12889161760" default="-1" value="-1" />
<parameter name="绿 扩展点4 偏移" id="2223" flags="12889161760" default="0" value="0" />
<parameter name="绿 扩展点4 X" id="2227" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝 扩展点1 偏移" id="2228" flags="12889161760" default="0" value="0" />
<parameter name="蓝 扩展点1 X" id="2232" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝 扩展点2 偏移" id="2229" flags="12889161760" default="0" value="0" />
<parameter name="蓝 扩展点2 X" id="2233" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝 扩展点3 偏移" id="2230" flags="12889161760" default="0" value="0" />
<parameter name="蓝 扩展点3 X" id="2234" flags="12889161760" default="-1" value="-1" />
<parameter name="蓝 扩展点4 偏移" id="2231" flags="12889161760" default="0" value="0" />
<parameter name="蓝 扩展点4 X" id="2235" flags="12889161760" default="-1" value="-1" />
<parameter name="曲线" id="2044" flags="12889161760" default="1" value="1" />
<parameter name="红 色相" id="2068" flags="12889161760" default="0" value="0" />
<parameter name="橙 色相" id="2069" flags="12889161760" default="0" value="0" />
<parameter name="黄 色相" id="2070" flags="12889161760" default="0" value="0" />
<parameter name="绿 色相" id="2071" flags="12889161760" default="0" value="0" />
<parameter name="青 色相" id="2072" flags="12889161760" default="0" value="0" />
<parameter name="蓝 色相" id="2073" flags="12889161760" default="0" value="0" />
<parameter name="紫 色相" id="2074" flags="12889161760" default="0" value="0" />
<parameter name="洋红 色相" id="2075" flags="12889161760" default="0" value="0" />
<parameter name="红 饱和度" id="2076" flags="12889161760" default="0" value="0" />
<parameter name="橙 饱和度" id="2077" flags="12889161760" default="0" value="0" />
<parameter name="黄 饱和度" id="2078" flags="12889161760" default="0" value="0" />
<parameter name="绿 饱和度" id="2079" flags="12889161760" default="0" value="0" />
<parameter name="青 饱和度" id="2080" flags="12889161760" default="0" value="0" />
<parameter name="蓝 饱和度" id="2081" flags="12889161760" default="0" value="0" />
<parameter name="紫 饱和度" id="2082" flags="12889161760" default="0" value="0" />
<parameter name="洋红 饱和度" id="2083" flags="12889161760" default="0" value="0" />
<parameter name="红 明亮度" id="2084" flags="12889161760" default="0" value="0" />
<parameter name="橙 明亮度" id="2085" flags="12889161760" default="0" value="0" />
<parameter name="黄 明亮度" id="2086" flags="12889161760" default="0" value="0" />
<parameter name="绿 明亮度" id="2087" flags="12889161760" default="0" value="0" />
<parameter name="青 明亮度" id="2088" flags="12889161760" default="0" value="0" />
<parameter name="蓝 明亮度" id="2089" flags="12889161760" default="0" value="0" />
<parameter name="紫 明亮度" id="2090" flags="12889161760" default="0" value="0" />
<parameter name="洋红 明亮度" id="2091" flags="12889161760" default="0" value="0" />
<parameter name="自定义色 R" id="2092" flags="12889161760" default="1" value="1" />
<parameter name="自定义 色相" id="2096" flags="12889161760" default="0" value="0" />
<parameter name="自定义 色相范围" id="2140" flags="12889161760" default="30" value="30" />
<parameter name="自定义色 G" id="2093" flags="12889161760" default="0.10000000000000001" value="0.10000000000000001" />
<parameter name="自定义 饱和度" id="2097" flags="12889161760" default="0" value="0" />
<parameter name="自定义 饱和度范围" id="2141" flags="12889161760" default="40" value="40" />
<parameter name="自定义色 B" id="2094" flags="12889161760" default="0.57999999999999996" value="0.57999999999999996" />
<parameter name="自定义 明亮度" id="2098" flags="12889161760" default="0" value="0" />
<parameter name="自定义 明亮度范围" id="2142" flags="12889161760" default="40" value="40" />
<parameter name="显示自定义色选区" id="2144" flags="12889161760" default="0" value="0" />
<parameter name="HSL 混色" id="2045" flags="12889161760" default="1" value="1" />
<parameter name="阴影 色相" id="2106" flags="12889161760" default="0" value="0" />
<parameter name="阴影 饱和度" id="2107" flags="12889161760" default="0" value="0" />
<parameter name="阴影 明亮度" id="2113" flags="12889161760" default="0" value="0" />
<parameter name="中间调 色相" id="2104" flags="12889161760" default="0" value="0" />
<parameter name="中间调 饱和度" id="2105" flags="12889161760" default="0" value="0" />
<parameter name="中间调 明亮度" id="2112" flags="12889161760" default="0" value="0" />
<parameter name="高光 色相" id="2108" flags="12889161760" default="0" value="0" />
<parameter name="高光 饱和度" id="2109" flags="12889161760" default="0" value="0" />
<parameter name="高光 明亮度" id="2114" flags="12889161760" default="0" value="0" />
<parameter name="全局 色相" id="2148" flags="12889161760" default="0" value="0" />
<parameter name="全局 饱和度" id="2149" flags="12889161760" default="0" value="0" />
<parameter name="全局 明亮度" id="2150" flags="12889161760" default="0" value="0" />
<parameter name="混合" id="2101" flags="12889161760" default="50" value="50" />
<parameter name="平衡" id="2102" flags="12889161760" default="0" value="0" />
<parameter name="颜色分级" id="2100" flags="12889161760" default="1" value="1" />
<parameter name="红原色 色相" id="2121" flags="12889161760" default="0" value="0" />
<parameter name="红原色 饱和度" id="2122" flags="12889161760" default="0" value="0" />
<parameter name="绿原色 色相" id="2123" flags="12889161760" default="0" value="0" />
<parameter name="绿原色 饱和度" id="2124" flags="12889161760" default="0" value="0" />
<parameter name="蓝原色 色相" id="2125" flags="12889161760" default="0" value="0" />
<parameter name="蓝原色 饱和度" id="2126" flags="12889161760" default="0" value="0" />
<parameter name="三原色" id="2120" flags="12889161760" default="1" value="1" />
<parameter name="RGB 输入黑" id="2156" flags="12889161760" default="0" value="0" />
<parameter name="RGB 伽马" id="2160" flags="12889161760" default="1" value="1" />
<parameter name="RGB 输入白" id="2164" flags="12889161760" default="255" value="255" />
<parameter name="RGB 输出黑" id="2168" flags="12889161760" default="0" value="0" />
<parameter name="RGB 输出白" id="2172" flags="12889161760" default="255" value="255" />
<parameter name="红 输入黑" id="2157" flags="12889161760" default="0" value="0" />
<parameter name="红 伽马" id="2161" flags="12889161760" default="1" value="1" />
<parameter name="红 输入白" id="2165" flags="12889161760" default="255" value="255" />
<parameter name="红 输出黑" id="2169" flags="12889161760" default="0" value="0" />
<parameter name="红 输出白" id="2173" flags="12889161760" default="255" value="255" />
<parameter name="绿 输入黑" id="2158" flags="12889161760" default="0" value="0" />
<parameter name="绿 伽马" id="2162" flags="12889161760" default="1" value="1" />
<parameter name="绿 输入白" id="2166" flags="12889161760" default="255" value="255" />
<parameter name="绿 输出黑" id="2170" flags="12889161760" default="0" value="0" />
<parameter name="绿 输出白" id="2174" flags="12889161760" default="255" value="255" />
<parameter name="蓝 输入黑" id="2159" flags="12889161760" default="0" value="0" />
<parameter name="蓝 伽马" id="2163" flags="12889161760" default="1" value="1" />
<parameter name="蓝 输入白" id="2167" flags="12889161760" default="255" value="255" />
<parameter name="蓝 输出黑" id="2171" flags="12889161760" default="0" value="0" />
<parameter name="蓝 输出白" id="2175" flags="12889161760" default="255" value="255" />
<parameter name="色阶" id="2152" flags="12889161760" default="1" value="1" />
<parameter name="黑白 红" id="2180" flags="12889161760" default="40" value="40" />
<parameter name="黑白 黄" id="2181" flags="12889161760" default="60" value="60" />
<parameter name="黑白 绿" id="2182" flags="12889161760" default="40" value="40" />
<parameter name="黑白 青" id="2183" flags="12889161760" default="60" value="60" />
<parameter name="黑白 蓝" id="2184" flags="12889161760" default="20" value="20" />
<parameter name="黑白 洋红" id="2185" flags="12889161760" default="80" value="80" />
<parameter name="着色色相" id="2186" flags="12889161760" default="0" value="0" />
<parameter name="着色饱和度" id="2187" flags="12889161760" default="0" value="0" />
<parameter name="黑白混合" id="2270" flags="12889161760" default="0" value="0" />
<parameter name="黑白混色" id="2176" flags="12889161760" default="1" value="1" />
<parameter name="保持明度" id="2189" flags="12889161760" default="1" value="1" />
<parameter name="阴影 青 ↔ 红" id="2192" flags="12889161760" default="0" value="0" />
<parameter name="阴影 洋红 ↔ 绿" id="2193" flags="12889161760" default="0" value="0" />
<parameter name="阴影 黄 ↔ 蓝" id="2194" flags="12889161760" default="0" value="0" />
<parameter name="中间调 青 ↔ 红" id="2196" flags="12889161760" default="0" value="0" />
<parameter name="中间调 洋红 ↔ 绿" id="2197" flags="12889161760" default="0" value="0" />
<parameter name="中间调 黄 ↔ 蓝" id="2198" flags="12889161760" default="0" value="0" />
<parameter name="高光 青 ↔ 红" id="2200" flags="12889161760" default="0" value="0" />
<parameter name="高光 洋红 ↔ 绿" id="2201" flags="12889161760" default="0" value="0" />
<parameter name="高光 黄 ↔ 蓝" id="2202" flags="12889161760" default="0" value="0" />
<parameter name="色彩平衡" id="2188" flags="12889161760" default="1" value="1" />
<parameter name="红输出 ← 红输入" id="2276" flags="12889161760" default="1" value="1" />
<parameter name="红输出 ← 绿输入" id="2277" flags="12889161760" default="0" value="0" />
<parameter name="红输出 ← 蓝输入" id="2278" flags="12889161760" default="0" value="0" />
<parameter name="绿输出 ← 红输入" id="2280" flags="12889161760" default="0" value="0" />
<parameter name="绿输出 ← 绿输入" id="2281" flags="12889161760" default="1" value="1" />
<parameter name="绿输出 ← 蓝输入" id="2282" flags="12889161760" default="0" value="0" />
<parameter name="蓝输出 ← 红输入" id="2284" flags="12889161760" default="0" value="0" />
<parameter name="蓝输出 ← 绿输入" id="2285" flags="12889161760" default="0" value="0" />
<parameter name="蓝输出 ← 蓝输入" id="2286" flags="12889161760" default="1" value="1" />
<parameter name="保持亮度" id="2289" flags="12889161760" default="0" value="0" />
<parameter name="保持饱和度" id="2290" flags="12889161760" default="0" value="0" />
<parameter name="通道混合强度" id="2291" flags="12889161760" default="1" value="1" />
<parameter name="通道混合器" id="2288" flags="12889161760" default="1" value="1" />
<parameter name="胶片混合强度" id="2293" flags="12889161760" default="1" value="1" />
<parameter name="启用减色" id="2294" flags="12889161760" default="0" value="0" />
<parameter name="整体减色" id="2295" flags="12889161760" default="1" value="1" />
<parameter name="青色减色" id="2296" flags="12889161760" default="1" value="1" />
<parameter name="洋红减色" id="2297" flags="12889161760" default="1" value="1" />
<parameter name="黄色减色" id="2298" flags="12889161760" default="1" value="1" />
<parameter name="密度" id="2299" flags="12889161760" default="0" value="0" />
<parameter name="密度模式" id="2300" flags="12889161760" default="2" value="2" />
<parameter name="胶片亮度模型" id="2301" flags="12889161760" default="6" value="6" />
<parameter name="启用晕光" id="2302" flags="12889161760" default="0" value="0" />
<parameter name="散射半径" id="2303" flags="12889161760" default="5" value="5" />
<parameter name="染料透射" id="2304" flags="12889161760" default="0" value="0" />
<parameter name="晕光增强" id="2305" flags="12889161760" default="1" value="1" />
<parameter name="启用辉光" id="2306" flags="12889161760" default="0" value="0" />
<parameter name="辉光灵敏度" id="2307" flags="12889161760" default="50" value="50" />
<parameter name="辉光扩散" id="2308" flags="12889161760" default="30" value="30" />
<parameter name="辉光强度" id="2309" flags="12889161760" default="50" value="50" />
<parameter name="启用颗粒" id="2310" flags="12889161760" default="0" value="0" />
<parameter name="颗粒数量" id="2311" flags="12889161760" default="0" value="0" />
<parameter name="颗粒大小" id="2312" flags="12889161760" default="1" value="1" />
<parameter name="胶片响应" id="2313" flags="12889161760" default="0" value="0" />
<parameter name="颜色变化" id="2314" flags="12889161760" default="0" value="0" />
<parameter name="颗粒帧保持" id="2315" flags="12889161760" default="1" value="1" />
<parameter name="颗粒种子" id="2316" flags="12889161760" default="0" value="0" />
<parameter name="启用暗角" id="2317" flags="12889161760" default="0" value="0" />
<parameter name="暗角强度" id="2318" flags="12889161760" default="1" value="1" />
<parameter name="暗角半径" id="2319" flags="12889161760" default="50" value="50" />
<parameter name="暗角过渡" id="2320" flags="12889161760" default="0.5" value="0.5" />
<parameter name="印片外观" id="2324" flags="12889161776" default="0" value="0" />
<parameter name="印片强度" id="2325" flags="12889161760" default="1" value="1" />
<parameter name="胶片模拟" id="2292" flags="12889161760" default="1" value="1" />
<parameter name="畸变校正" id="2329" flags="12889161760" default="0" value="0" />
<parameter name="画面缩放" id="2330" flags="12889161760" default="1" value="1" />
<parameter name="光学中心 X" id="2331" flags="12889161760" default="0.5" value="0.5" />
<parameter name="光学中心 Y" id="2332" flags="12889161760" default="0.5" value="0.5" />
<parameter name="镜头畸变修复" id="2328" flags="12889161760" default="1" value="1" />
<parameter name="混合" id="10001" flags="12884901888" default="1" value="1" />
<parameter name="翻转" id="10002" flags="12889161760" default="0" value="0" />
<parameter name="输入点" id="10003" flags="12889161760" default="1" value="1" />
<parameter name="发布 OSC" id="10005" flags="8589934592" default="0" value="1" />
</filter>
</scenenode>
<aspectRatio>1</aspectRatio>
<flags>0</flags>
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>524304</baseFlags>
<parameter name="属性" id="1" flags="8589938704">
<parameter name="阴影" id="234" flags="8589938706">
<foldFlags>15</foldFlags>
</parameter>
<parameter name="颜色" id="243" flags="8589938688">
<parameter name="Hidden Channel" id="245" flags="8589934610" default="1" value="3" />
<parameter name="转换类型" id="247" flags="8590032912" default="3" value="3" />
<parameter name="PQ 峰值(尼特)" id="248" flags="8589967376" default="1000" value="1000" />
</parameter>
<parameter name="投影" id="208" flags="8589973522">
<foldFlags>131087</foldFlags>
</parameter>
<parameter name="四角" id="207" flags="8589973506">
<foldFlags>131087</foldFlags>
</parameter>
<parameter name="裁剪" id="216" flags="8589973522">
<foldFlags>131087</foldFlags>
</parameter>
</parameter>
<parameter name="对象" id="2" flags="8589938704">
<parameter name="类型" id="307" flags="12884901904" default="1" value="1" />
<parameter name="固定分辨率" id="301" flags="8589936658" default="0" value="0" />
<parameter name="固定宽度" id="302" flags="12884901910" default="3840" value="3840" />
<parameter name="固定高度" id="303" flags="12884901910" default="2160" value="2160" />
<parameter name="光圈宽度" id="312" flags="12884901906" default="3840" value="3840" />
<parameter name="光圈高度" id="313" flags="12884901906" default="2160" value="2160" />
</parameter>
</layer>
<footage name="媒体层" id="10049">
<clip name="效果源" id="10048">
<pathURL>Drop Zone.tiff</pathURL>
<missingWidth>1200</missingWidth>
<missingHeight>1200</missingHeight>
<missingDuration>0.033333333333333333</missingDuration>
<creationDuration>1</creationDuration>
<mediaID />
<flags>0</flags>
<timing in="0 1 1 0" out="0 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>524304</baseFlags>
<parameter name="属性" id="1" flags="8589938704" />
<parameter name="对象" id="2" flags="8589938704">
<parameter name="像素宽高比" id="104" flags="12884901888" default="1" value="1" />
<parameter name="帧速率" id="107" flags="8589934592" default="0" value="30" />
<parameter name="固定宽度" id="114" flags="12884901888" default="1200" value="1200" />
<parameter name="固定高度" id="115" flags="12884901888" default="1200" value="1200" />
<parameter name="使用背景颜色" id="116" flags="8589934594" default="0" value="0" />
<parameter name="背景颜色" id="117" flags="8589971458">
<foldFlags>15</foldFlags>
<parameter name="红色" id="1" flags="8589967376" default="1" value="1" />
<parameter name="绿色" id="2" flags="8589967376" default="1" value="1" />
<parameter name="蓝色" id="3" flags="8589967376" default="1" value="1" />
</parameter>
<parameter name="Missing Is Still" id="128" flags="8589934610" default="0" value="1" />
</parameter>
</clip>
<flags>0</flags>
<timing in="0 1 1 0" out="0 120000 1 0" offset="0 1 1 0" />
<foldFlags>0</foldFlags>
<baseFlags>524304</baseFlags>
<parameter name="属性" id="1" flags="8589938704" />
<parameter name="对象" id="2" flags="8589938704" />
</footage>
</scene>
</ozml>
+31 -12
查看文件
@@ -16,6 +16,7 @@ OUTPUT_VERSION='5.11'
OUTPUT_DISPLAY_VERSION='5.4.5'
NATIVE_ALPHABET='*-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
STANDARD_ALPHABET='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
STARTERS={'primary':'一级调色','hsl':'HSL'}
CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'}
@@ -58,7 +59,11 @@ def custom_archive(encoded):
return text,name
def build(model):
def archives(model, starter):
return model['archivesBase64'] | (model['starterArchives'][starter] if starter else {})
def build(model, starter=None):
root=E.parse(SOURCES/'NativeEffectSource.moef').getroot()
scene=root.find('scene');project=scene.find('scenenode[@factoryID="4"]')
source=scene.find('.//scenenode[@name="效果源"]')
@@ -83,7 +88,7 @@ def build(model):
host=list(filt.findall('parameter'))
for node in host:filt.remove(node)
for pid,name in [('9000','大鱼调色'),('9001','LUT 文件'),('9002','工具与蒙版')]:
text,class_name=custom_archive(model['archivesBase64'][pid])
text,class_name=custom_archive(archives(model, starter)[pid])
expected={'9000':'DYInspectorToken','9001':'DYAssetState','9002':'DYToolDocument'}[pid]
if class_name!=expected:raise ValueError('Wrong custom parameter class')
flags='12884901888' if pid=='9000' else '12889161776'
@@ -104,7 +109,8 @@ def build(model):
for node in list(pub):
if node.tag!='version':pub.remove(node)
E.SubElement(pub,'target',object='10060',channel='./9000',name='大鱼调色')
E.SubElement(pub,'target',object='10060',channel='./10001',name='混合')
if not starter:
E.SubElement(pub,'target',object='10060',channel='./10001',name='混合')
current=scene.find('currentObject')
if current is None:
current=E.Element('currentObject');scene.insert(list(scene).index(scene.find('currentFrame'))+1,current)
@@ -119,7 +125,7 @@ def build(model):
return data
def verify(data,model):
def verify(data,model,starter=None):
root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')}
assert root.get('version')==OUTPUT_VERSION and root.findtext('displayversion')==OUTPUT_DISPLAY_VERSION
assert all(not list(root.iter(tag)) for tag in ['Object3DEnvironments','DRTSupport','onHDRDisplay','missingDynamicRangeType'])
@@ -133,7 +139,7 @@ def verify(data,model):
# FCP also applies a changed dataValue to existing nil-state instances.
# Keep both carriers at the original registered value; V3 is explicit opt-in.
for pid in ['9000','9001','9002']:
assert params[pid].findtext('defaultVal')==params[pid].findtext('dataValue')==custom_archive(model['archivesBase64'][pid])[0]
assert params[pid].findtext('defaultVal')==params[pid].findtext('dataValue')==custom_archive(archives(model, starter)[pid])[0]
assert all(not v in data for v in (b'CameraRawTables',b'1.png',b'relativeURL'))
assert len(root.findall('.//behavior'))==0 and len(root.findall('.//keypoint'))==0
assert scene.find('.//scenenode[@name="效果源"]/parameter[@id="2"]/parameter[@id="321"]').get('value')=='3'
@@ -145,7 +151,9 @@ def verify(data,model):
if node.tag in CONTENT_TAGS and node is not project and node.find('baseFlags') is not None and int(node.findtext('baseFlags'))&0x10000001:selected.append(node.get('id'))
assert not selected and scene.findtext('currentObject')==project.get('id')
pub=scene.find('publishSettings').findall('target')
assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==[('10060','./9000','大鱼调色'),('10060','./10001','混合')]
expected=[('10060','./9000','大鱼调色')]
if not starter:expected.append(('10060','./10001','混合'))
assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==expected
assert all(scene.find('.//scenenode[@id="'+identity+'"]') is None for identity in ['10080','10081','10082'])
assert all(text.encode() not in data for text in ['FCP 版本作者','更多模板浏览器访问','大鱼先森Media','dayu.media'])
assert not any(f.get('uuid')=='dd0036f96c9e4bfdadb82f71fbf5c9d8' for f in root.findall('factory'))
@@ -154,11 +162,22 @@ def verify(data,model):
def main():
p=argparse.ArgumentParser(description=__doc__);p.add_argument('--output',type=Path,default=TEMPLATE/'大鱼调色.moef');p.add_argument('--overwrite',action='store_true');p.add_argument('--refresh-model',action='store_true');args=p.parse_args()
if args.output.exists() and not args.overwrite:raise FileExistsError('Output exists; choose another file or explicitly --overwrite')
p=argparse.ArgumentParser(description=__doc__)
p.add_argument('--output',type=Path,default=TEMPLATE/'大鱼调色.moef')
p.add_argument('--overwrite',action='store_true')
p.add_argument('--refresh-model',action='store_true')
p.add_argument('--starters',action='store_true',help='Build the two starter MOEFs alongside the full effect')
args=p.parse_args()
outputs={None:args.output}
if args.starters:
outputs.update({starter:args.output.parent/name/(name+'.moef') for starter,name in STARTERS.items()})
for output in outputs.values():
if output.exists() and not args.overwrite:raise FileExistsError('Output exists: '+str(output))
model=refresh_metadata() if args.refresh_model else metadata()
data=build(model);report=verify(data,model)
args.output.parent.mkdir(parents=True,exist_ok=True);args.output.write_bytes(data)
(TEMPLATE/'verification/StaticContract.json').write_text(json.dumps(report,ensure_ascii=False,indent=2)+'\n')
print(json.dumps(report,ensure_ascii=False,indent=2))
for starter,output in outputs.items():
data=build(model,starter);report=verify(data,model,starter)
output.parent.mkdir(parents=True,exist_ok=True);output.write_bytes(data)
if not starter:
(TEMPLATE/'verification/StaticContract.json').write_text(json.dumps(report,ensure_ascii=False,indent=2)+'\n')
print(json.dumps(dict(report,path=str(output),starter=starter),ensure_ascii=False))
if __name__=='__main__':main()
+51 -15
查看文件
@@ -2,6 +2,7 @@
"""Single-install Release delivery; keeps a product lock through host acceptance."""
from pathlib import Path
import subprocess,os,json,shutil,plistlib,uuid,sys,datetime,hashlib,time
from template_payload import template_files
ROOT=Path(__file__).resolve().parent.parent
CACHE=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color')
LOCK=Path('/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock')
@@ -9,7 +10,9 @@ DEST=Path('/Library/Plug-Ins/FxPlug/大鱼调色.app')
APP=CACHE/'DerivedData/Build/Products/Release/大鱼调色.app'
LOOSE=CACHE/'DerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit'
PLUGIN='Contents/PlugIns/大鱼调色 XPC Service.pluginkit'
TEMPLATE=Path.home()/'Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef'
TEMPLATE_ROOT=Path.home()/'Movies/Motion Templates.localized/Effects.localized/大鱼调色'
TEMPLATE=TEMPLATE_ROOT/'大鱼调色/大鱼调色.moef'
BUNDLED_TEMPLATES=Path('Contents/Resources/FCP Templates')
IDENTITY='Developer ID Application: zhong luo (B3W25FX5H5)'
PROFILE='codex-dayu-notary-B3W25FX5H5'
KEYCHAIN='/Users/mac/Library/Keychains/login.keychain-db'
@@ -44,6 +47,43 @@ def self_test(executable,report):
failed=[x.get('name') for x in parsed.get('results',[]) if not x.get('pass',True)]
raise RuntimeError('原生自检未通过,正式旧版未替换。诊断:'+str(report)+';失败项:'+str(failed))
return parsed
def install_templates():
# Keep the previous Motion Templates files available until the new set is
# verified. Stage each replacement on the same volume as the destination.
changed=[]
hashes={}
try:
for _,bundled,installed in template_files():
source=DEST/BUNDLED_TEMPLATES/bundled
target=TEMPLATE_ROOT/installed
target.parent.mkdir(parents=True,exist_ok=True)
previous=(target.read_bytes(),target.stat().st_mode & 0o777,target.stat().st_flags) if target.exists() else None
data=source.read_bytes()
changed.append((target,previous))
write_template_file(target,data,0o644,2 if target.suffix=='.png' else 0)
assert target.read_bytes()==data
hashes[str(installed)]=hashlib.sha256(data).hexdigest()
except Exception:
for target,previous in reversed(changed):
if previous is not None:
write_template_file(target,*previous)
elif target.exists():
os.chflags(target,0)
target.unlink()
raise
return hashes
def write_template_file(target,data,mode,flags):
temp=target.with_name('.dayu-color-stage-'+uuid.uuid4().hex)
try:
temp.write_bytes(data)
temp.chmod(mode)
if target.exists() and target.stat().st_flags:os.chflags(target,0)
os.replace(temp,target)
if flags:os.chflags(target,flags)
finally:
temp.unlink(missing_ok=True)
def main():
hosts_closed();CACHE.mkdir(parents=True,exist_ok=True);LOCK.parent.mkdir(parents=True,exist_ok=True);LOCK.mkdir()
(LOCK/'owner.json').write_text(json.dumps(dict(PID=os.getpid(),cwd=str(ROOT),product='大鱼调色',started=datetime.datetime.now(datetime.timezone.utc).isoformat())))
@@ -54,9 +94,13 @@ def main():
if any(l.endswith('/Contents/MacOS/大鱼调色') for l in run('ps','-axo','comm=').splitlines()):raise RuntimeError('请先正常退出当前大鱼调色窗口')
print('Building final Release',flush=True)
run('xcodebuild','-project','大鱼调色.xcodeproj','-scheme','Wrapper Application','-configuration','Release','-enableAddressSanitizer','NO','-derivedDataPath',str(CACHE/'DerivedData'),'clean','build',log=CACHE/'release-build.log')
b=APP/'Contents/Resources/FCP Templates/大鱼调色.moef';b.parent.mkdir(parents=True,exist_ok=True);shutil.copy2(ROOT/'template/大鱼调色.moef',b)
for name in ['large.png','small.png']:
if (ROOT/'template'/name).exists():shutil.copy2(ROOT/'template'/name,b.parent/name)
for source,bundled,_ in template_files():
target=APP/BUNDLED_TEMPLATES/bundled
target.parent.mkdir(parents=True,exist_ok=True)
shutil.copyfile(ROOT/'template'/source,target)
target.chmod(0o644)
# Sources on exFAT can be exposed as owner-only. Installer changes ownership to root.
(APP/'Contents/Resources/Basis_balanceWheel.png').chmod(0o644)
identity(APP,'com.dayu.color');plugin=APP/PLUGIN;identity(plugin,'com.dayu.color.XPC')
# Xcode registers its build product with Launch Services. Keep the host from
# discovering this generated copy while signing/notarization are pending.
@@ -92,24 +136,16 @@ def main():
if str(DEST/'Contents/MacOS/大鱼调色') in run('ps','-axo','comm=').splitlines():break
time.sleep(.25)
else:raise RuntimeError('未从正式安装路径启动')
template_hashes=install_templates()
except Exception:
failed=DEST.parent/('.dayu-color-failed-'+uuid.uuid4().hex+'.app');os.replace(DEST,failed)
if old:os.replace(old,DEST);old=None
raise
TEMPLATE.parent.mkdir(parents=True,exist_ok=True)
if TEMPLATE.exists():shutil.copy2(TEMPLATE,CACHE/'previous-template.moef')
tmp=TEMPLATE.with_name('.dayu-color-template-stage.moef');shutil.copy2(DEST/'Contents/Resources/FCP Templates/大鱼调色.moef',tmp);os.replace(tmp,TEMPLATE)
for name in ['large.png','small.png']:
source=DEST/'Contents/Resources/FCP Templates'/name;target=TEMPLATE.parent/name
if source.exists():
if target.exists():os.chflags(target,0)
shutil.copy2(source,target);os.chflags(target,2)
# All generated copies are removed before final registry/host verification.
for copy,expected in [(APP,'com.dayu.color'),(LOOSE,'com.dayu.color.XPC')]:
if copy.exists():identity(copy,expected);unregister(copy/PLUGIN if copy.suffix=='.app' else copy);shutil.rmtree(copy)
if old:unregister(old/PLUGIN)
archive.unlink();backup=CACHE/'previous-template.moef'
if backup.exists():backup.unlink()
archive.unlink()
# Unregistering an old copy can race the host's launch registration. Re-add
# only the verified installed path; never repeat signing/notarization/install.
for attempt in range(3):
@@ -118,7 +154,7 @@ def main():
if entries:break
time.sleep(.5)
if len(entries)!=1 or not entries[0].rstrip().endswith('\t'+str(DEST/PLUGIN)):raise RuntimeError('PluginKit发现多份/错误版本: '+registry)
record=dict(status='installed-awaiting-host-verification',path=str(DEST),bundleID='com.dayu.color',version=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleShortVersionString'],build=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleVersion'],team='B3W25FX5H5',notaryID=result['id'],notaryStatus=result['status'],gatekeeper=gate,sourceCommit=run('git','rev-parse','HEAD'),templatePath=str(TEMPLATE),templateSHA256=hashlib.sha256(TEMPLATE.read_bytes()).hexdigest(),shaderSHA256=hashlib.sha256((DEST/PLUGIN/'Contents/Resources/default.metallib').read_bytes()).hexdigest())
record=dict(status='installed-awaiting-host-verification',path=str(DEST),bundleID='com.dayu.color',version=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleShortVersionString'],build=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleVersion'],team='B3W25FX5H5',notaryID=result['id'],notaryStatus=result['status'],gatekeeper=gate,sourceCommit=run('git','rev-parse','HEAD'),templatePath=str(TEMPLATE),templateSHA256=template_hashes[str(TEMPLATE.relative_to(TEMPLATE_ROOT))],installedTemplateSHA256=template_hashes,shaderSHA256=hashlib.sha256((DEST/PLUGIN/'Contents/Resources/default.metallib').read_bytes()).hexdigest())
if old:record['previousInstallBackup']=str(old)
output=ROOT/'verification/Delivery.json';output.write_text(json.dumps(record,ensure_ascii=False,indent=2)+'\n')
run('open',str(DEST));print('FORMAL_INSTALLED. Run installed self-test and host verification; type complete only after success. Type leave to preserve pending state.',flush=True)
+15
查看文件
@@ -0,0 +1,15 @@
"""Shared source, bundle and Motion Templates paths for the shipped effects."""
from pathlib import Path
EFFECTS = ("大鱼调色", "一级调色", "HSL")
PREVIEWS = ("large.png", "small.png")
def template_files():
for effect in EFFECTS:
for name in (effect + ".moef", *PREVIEWS):
installed = Path(effect) / name
# Preserve the full effect's original flat bundle layout and artwork.
bundled = Path(name) if effect == EFFECTS[0] else installed
source = Path(name) if name in PREVIEWS else bundled
yield source, bundled, installed
+4 -1
查看文件
@@ -9,7 +9,10 @@ int main(int argc,char **argv){@autoreleasepool{
updater.changed=^(NSDictionary *state){NSString *phase=state[@"phase"];[phases addObject:phase];
if([phase isEqual:@"available"]){if(started){done=YES;fprintf(stderr,"%s\n",[state description].UTF8String);}else{started=YES;dispatch_async(dispatch_get_main_queue(),^{[updater download];});}}
if([phase isEqual:@"ready"]){done=YES;passed=YES;}
if([phase isEqual:@"failed"]||[phase isEqual:@"latest"]){done=YES;fprintf(stderr,"%s\n",[state description].UTF8String);}
if([@[@"failed",@"latest",@"integrity_rejected"] containsObject:phase]){
done=YES;fprintf(stderr,"%s\n",[state description].UTF8String);
if([phase isEqual:@"integrity_rejected"])fprintf(stderr,"Run the live update check in the officially installed app.\n");
}
};
[updater check];NSDate *deadline=[NSDate dateWithTimeIntervalSinceNow:360];
while(!done&&deadline.timeIntervalSinceNow>0)[NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:.1]];
+6 -1
查看文件
@@ -13,7 +13,12 @@ import xml.etree.ElementTree as E
ROOT=Path(__file__).resolve().parent.parent
module=runpy.run_path(str(ROOT/'tools/build_template.py'),run_name='template_contract')
file=ROOT/'template'/'\u5927\u9c7c\u8c03\u8272.moef'
data=file.read_bytes();contract=module['verify'](data,module['metadata']())
model=module['metadata']()
data=file.read_bytes();contract=module['verify'](data,model)
for starter,name in module['STARTERS'].items():
path=file.parent/name/(name+'.moef')
module['verify'](path.read_bytes(),model,starter)
print('Verified starter:',name)
root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')}
project=[node for node in scene.findall('scenenode') if factories.get(node.get('factoryID'))==module['PROJECT_UUID']][0]
assert root.get('version')=='5.11' and root.findtext('displayversion')=='5.4.5'
+84
查看文件
@@ -0,0 +1,84 @@
{
"passResult": true,
"articleID": 15792,
"url": "https://dayu.media/15792/",
"status": "publish",
"title": "大鱼调色 1.13.2 公测版|安装完整性校验与仿制图章",
"requestID": "dayu-color-1132-build86-article-20261105",
"changedResourceFields": [
"cao_downurl",
"cao_original_filename"
],
"commercialAndVideoFieldsPreserved": true,
"authorCategoriesTagsPreserved": true,
"fcpxSettingsPreserved": true,
"seo": {
"title": {
"enabled": true,
"value": "大鱼调色 1.13.2 公测版|安装完整性校验与仿制图章"
},
"description": {
"enabled": true,
"value": "大鱼调色 1.13.2 是适用于 Final Cut Pro 与 Motion 的原生调色插件。新版增加安装完整性校验,并包含按原像素复制的仿制图章。官方原始安装包已签名公证,可以原样转发。适用于 Apple Silicon 和 macOS 14.6 或更新版本。"
},
"keywords": {
"enabled": true,
"value": "大鱼调色,Final Cut Pro,Motion,FxPlug4,调色插件,仿制图章,安装完整性校验"
}
},
"frontendChecks": [
{
"url": "https://dayu.media/15792/",
"http": 200,
"titleAndSEOExact": true,
"updateAndRecoveryNotes": true,
"codeBlock": true,
"historicalImagesRetained": true,
"coverRetained": true,
"priceYuan": 50,
"memberPriceYuan": 0,
"paidPackageURLAbsentFromHTML": true
},
{
"url": "https://dayu.media/15792/?release-check=1.13.2-86",
"http": 200,
"titleAndSEOExact": true,
"updateAndRecoveryNotes": true,
"codeBlock": true,
"historicalImagesRetained": true,
"coverRetained": true,
"priceYuan": 50,
"memberPriceYuan": 0,
"paidPackageURLAbsentFromHTML": true
}
],
"featuredMedia": {
"id": 15854,
"url": "https://dayu.media/wp-content/uploads/2026/11/1793865756-f106faae77b9559.png",
"source": "template/large.png",
"http": 200,
"bytes": 261628,
"sha256": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a"
},
"historicalBodyImageIDs": [
15856,
15840,
15841
],
"package": {
"version": "1.13.2",
"build": 86,
"downloadVerified": true,
"http": 200,
"bytes": 45359239,
"sha256": "6c18bc081cd9d5099ae821df5d5da43585f9db292345c18db4a4e12cce1f133f",
"appPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"effect": "效果 / 大鱼调色 / 大鱼调色"
},
"updateChannel": {
"version": "1.12.0",
"build": 79
},
"rawPrivateResponses": "Local build cache only",
"purchaseFlow": "Anonymous purchase prompt checked; no transaction performed."
}
+109
查看文件
@@ -0,0 +1,109 @@
{
"passResult": true,
"articleID": 15792,
"url": "https://dayu.media/15792/",
"status": "publish",
"title": "大鱼调色 1.14.3 公测版|图章稳定跟踪与逐帧预览",
"requests": [
{
"id": "dayu-color-1143-build94-article-20261106",
"payload": "Publishing/1.14.3/Article-Payload.json",
"payloadSHA256": "11a549db1cf1d6c68b1b8a35df60d745a01a7ee9afe255f2fe922d0698ea7be8",
"uploaded": [
"package",
"cover"
]
},
{
"id": "dayu-color-1143-build94-package-name-20261106",
"payload": {
"resource": {
"cao_original_filename": "大鱼调色-1.14.3.pkg"
}
}
}
],
"changedResourceFields": [
"cao_downurl",
"cao_original_filename"
],
"commercialAndVideoFieldsPreserved": true,
"authorCategoriesTagsPreserved": true,
"fcpxSettingsPreserved": true,
"seo": {
"title": {
"enabled": true,
"value": "大鱼调色 1.14.3 公测版|图章稳定跟踪与逐帧预览"
},
"description": {
"enabled": true,
"value": "大鱼调色 1.14.3 是适用于 Final Cut Pro 和 Motion 的原生调色插件。新版平滑仿制图章的取样与覆盖轨迹,为图章和蒙版加入跟踪进度及逐帧预览。官方 PKG 已签名公证,不加密,不限制安装数量。支持 Apple Silicon 和 macOS 14.6 或更新版本。"
},
"keywords": {
"enabled": true,
"value": "大鱼调色,Final Cut Pro,Motion,FxPlug4,调色插件,仿制图章,蒙版跟踪,逐帧预览"
}
},
"frontendChecks": [
{
"url": "https://dayu.media/15792/",
"http": 200,
"titleAndSEOExact": true,
"originalInterfaceAndHistoricalImagesVisible": true,
"coverOpenGraph": true,
"priceYuan": 50,
"memberPriceYuan": 0,
"paidPackageURLAbsentFromHTML": true
},
{
"url": "https://dayu.media/15792/?release-check=1.14.3-94-final",
"http": 200,
"titleAndSEOExact": true,
"originalInterfaceAndHistoricalImagesVisible": true,
"coverOpenGraph": true,
"priceYuan": 50,
"memberPriceYuan": 0,
"paidPackageURLAbsentFromHTML": true
}
],
"interface": {
"id": 15861,
"url": "https://dayu.media/wp-content/uploads/2026/11/1793904608-fab8ae3ea572b84.png",
"width": 2046,
"height": 1570,
"source": "Publishing/1.14.3/dayu-color-1.14.3-interface.png",
"http": 200,
"bytes": 3462187,
"sha256": "c902a7f72b72037b53634087e393b650d7fe255ec27acc903932850589aabbfe"
},
"featuredMedia": {
"id": 15863,
"url": "https://dayu.media/wp-content/uploads/2026/11/1793904689-28c17d54e116509.png",
"width": 1672,
"height": 941,
"source": "Publishing/1.14.3/dayu-color-1.14.3-cover.png",
"text": "不加密 · 不限制安装数量",
"http": 200,
"bytes": 1712867,
"sha256": "544edae274817eb0648a774696dc5ba9a0c7f7028fbdcf485e54354855c44023"
},
"historicalBodyImageIDs": [
15840,
15841,
15856
],
"package": {
"id": 15862,
"version": "1.14.3",
"build": 94,
"downloadName": "大鱼调色-1.14.3.pkg",
"downloadVerified": true,
"appPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"effect": "效果 / 大鱼调色 / 大鱼调色",
"http": 200,
"bytes": 45381192,
"sha256": "6df64ae33f99bab95f8dc4e80d70a717fb210b35f90ce52cb38d47d814e709f4"
},
"purchaseFlow": "Anonymous storefront price checked; no purchase performed.",
"rawPrivateResponses": "Local build cache only"
}
+57
查看文件
@@ -0,0 +1,57 @@
{
"passResult": true,
"articleID": 15792,
"url": "https://dayu.media/15792/",
"status": "publish",
"title": "大鱼调色 1.14.3 公测版|图章稳定跟踪与逐帧预览",
"notice": "1.14.4 已修复“安装完整性验证失败”的问题,遇到此提示的用户请重新下载本文的 1.14.4 PKG 并安装。",
"requestID": "dayu-color-1144-build95-article15792-20261106",
"payloadSHA256": "b24b7495092429bdcfbe155fcec8e49c409d83cbb961badf68f7d99ff413ddb9",
"changedResourceFields": [
"cao_downurl",
"cao_original_filename"
],
"featuredMedia": 15863,
"authorCategoriesTagsPreserved": true,
"seoPreserved": true,
"commercialAndVideoFieldsPreserved": true,
"fcpxSettingsPreserved": true,
"frontendChecks": [
{
"url": "https://dayu.media/15792/",
"http": 200,
"noticeVisible": true,
"installVersionCorrect": true,
"seoPreserved": true,
"bodyImagesPreserved": true,
"priceYuan": 50,
"memberPriceYuan": 0,
"paidPackageURLAbsentFromHTML": true
},
{
"url": "https://dayu.media/15792/?release-check=1.14.4-95",
"http": 200,
"noticeVisible": true,
"installVersionCorrect": true,
"seoPreserved": true,
"bodyImagesPreserved": true,
"priceYuan": 50,
"memberPriceYuan": 0,
"paidPackageURLAbsentFromHTML": true
}
],
"package": {
"id": 15865,
"version": "1.14.4",
"build": 95,
"downloadName": "大鱼调色-1.14.4.pkg",
"http": 200,
"bytes": 45381319,
"sha256": "d9184b1ee1f44723e4fe9fa87c76878884dc8a4fe5c421712650852b0b2ece59",
"downloadVerified": true,
"byteIdenticalToOfficialPKG": true,
"downloadedTicketValidated": true,
"source": "Saved main download URL from article 15792"
},
"purchaseFlow": "Anonymous storefront price checked; full installer fetched from the saved download target without placing an order."
}
+10 -11
查看文件
@@ -1,13 +1,12 @@
{
"status": "resolved-published-and-download-verified",
"releaseID": 389,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.12.0-unified-workspace-20261105",
"tag": "v1.12.0-unified-workspace-20261105",
"commit": "b72e6b31724def5c174b692ef0a46b76992e780b",
"assetID": 33,
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.12.0-unified-workspace-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.12.0.pkg",
"bytes": 45329742,
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe",
"resolvedBy": "verification/Release.json",
"draftBrowserCopyRemovedAfterVerification": true
"status": "published-after-verified-draft-download",
"releaseID": 392,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.13.1-pixel-clone-20261105",
"tag": "v1.13.1-pixel-clone-20261105",
"commit": "46153a26edfbf44c5f22fbad5953ec74c0d33883",
"assetID": 36,
"downloadURL": "https://dayu.media/git/attachments/ee0a09fc-58b0-4883-9923-d5eb8aced007",
"bytes": 45352349,
"sha256": "8a19afadda6317d186541f37a221c46261a22ddabcdddec90d02e1315b693965",
"finalDownloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.13.1-pixel-clone-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.13.1.pkg"
}
@@ -0,0 +1,17 @@
{
"status": "verified",
"repository": "https://dayu.media/git/dayu/dayu-color.git",
"compiledSource": "1659f3d3853e2574f06a45687141fb444b5d02ca",
"trackedFiles": 613,
"fsck": "full strict",
"content": "All tracked files matched by SHA-256",
"lfs": false,
"submodules": false,
"independentBuild": false,
"versionTag": {
"tag": "v1.13.1-pixel-clone-20261105",
"commit": "46153a26edfbf44c5f22fbad5953ec74c0d33883",
"trackedFiles": 616,
"content": "All tracked files and verified PKG record match."
}
}
+7 -1
查看文件
@@ -7,5 +7,11 @@
"content": "all tracked files match the compiled commit by SHA-256",
"lfs": false,
"submodules": false,
"independentBuild": false
"independentBuild": false,
"versionTag": {
"tag": "v1.13.0-clone-stamp-20261105",
"commit": "07601e50bf604e7721bccf8be10e403a2bd030d1",
"trackedFiles": 613,
"content": "All tracked files and verified PKG record match."
}
}
+17 -6
查看文件
@@ -2,15 +2,26 @@
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.13.0",
"build": "83",
"version": "1.15.0",
"build": "96",
"team": "B3W25FX5H5",
"notaryID": "a9134875-aea9-4150-9e61-3051d23cd809",
"notaryID": "0d7b1f05-9ca7-4429-9dbd-7e484d9e9134",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "9977b5c41b07e0b08e6408c492498ba6e396c981",
"sourceCommit": "a2a6e57c13977ea2fc313f91b4d765ea86498f10",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"shaderSHA256": "d6734ff8fbc66ec0de2928fff59308c2e28e74ceb6f9664e61aaae30c046889b",
"hostVerification": "verification/HostCloneStamp1.13.0.json"
"installedTemplateSHA256": {
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
"一级调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"一级调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
"HSL/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"HSL/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
},
"shaderSHA256": "dfb36a120cd4d3ba09c960ac5d5905f61b5dc6d2d5024444b49aebd3d3fd43f1",
"hostVerification": "verification/HostLevel1.15.0.json"
}
+61
查看文件
@@ -0,0 +1,61 @@
{
"status": "passed",
"version": "1.13.1",
"build": "85",
"compiledSource": "1659f3d3853e2574f06a45687141fb444b5d02ca",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"host": "Final Cut Pro 12.4",
"hostPID": 29418,
"servicePID": 29424,
"qaProject": "1.12.0_76_OpenCV真实帧跟踪 2, independent QA copy",
"nativeChecks": 864,
"nativeCloneChecks": [
{
"keys": 2,
"name": "native-osc-drag-moves-only-the-stamp-source-and-keeps-tracking-keys",
"part": 7,
"pass": true,
"source": [
0.35,
0.35,
0.20000000298023224,
0.20000000298023224
],
"undoGroups": 1
},
{
"name": "native-osc-escape-cancels-the-stamp-source-drag-without-another-undo",
"pass": true
},
{
"name": "native-osc-stamp-resizes-coverage-without-rotation-handle-or-track-changes",
"pass": true
},
{
"name": "clone-stamp-ignores-legacy-tracking-scale-and-rotation",
"pass": true
},
{
"error": "未提供错误信息",
"name": "clone-stamp-resized-production-render",
"pass": true
},
{
"name": "clone-stamp-resize-extends-coverage-with-pixel-exact-translation",
"pass": true
}
],
"live": {
"inspectorVersion": "1.13.1",
"loadedAndRenderedBuild83Preset": true,
"trackingKeys": 99,
"roundTripIdentical": true,
"axes": "Source marker, center and four extent handles visible. No rotation handle or parameter row.",
"sourceDrag": "Live synthesized drag did not produce an OSC write. Source drag and undo verified by installed production callback tests.",
"helpText": "Workspace picture-edit button retains generic mask help text that mentions rotation."
},
"cleanup": {
"build83TemporaryBackupRemoved": true,
"historicPackagesRetained": true
}
}
@@ -0,0 +1,58 @@
{
"status": "passed",
"version": "1.13.4",
"build": "88",
"compiledSource": "7bf1f88fe9c2e9ea79a86791fcc0738550512973",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"host": "Final Cut Pro 12.4",
"hostPID": 43656,
"servicePID": 43675,
"nativeChecks": 870,
"sourceRecovery": {
"trackedFiles": 623,
"exactRemoteTree": true,
"strictFsck": true
},
"priorObserved": {
"build86": "User drag preview disappeared. Live OSC logs received the source and drag.",
"build87": "Real-footage creation accepted. The target and copied pixels remained visible; subsequent canvas edits did not commit with differing event and action times.",
"build87PublicPackage": false
},
"live": {
"qaMaterial": "Same real footage in the existing local QA project",
"coldReadback": "Recovered the previously created stamp after restarting Final Cut Pro.",
"savedTargetCenterBefore": [
0.7994009256362915,
0.601437509059906
],
"dragCommitTimes": [
{
"eventSeconds": "9.240000000",
"actionSeconds": "9.272333333"
},
{
"eventSeconds": "9.240000000",
"actionSeconds": "9.272333333"
},
{
"eventSeconds": "9.240000000",
"actionSeconds": "9.272333333"
}
],
"successfulHostCommits": 3,
"observation": "Target outline and effect stayed at a changed position after real mouse release. Source and destination were both visible.",
"scope": "Production installed version with direct mouse operations on the same real footage. No separate Motion host run.",
"userConfirmed": "The target can now be moved freely. User requested independent source and target tracking with scale detection."
},
"regression": [
"native-osc-stamp-preview-survives-async-save-and-different-render-time",
"native-osc-stamp-selects-saved-overlay-when-action-time-differs",
"native-osc-drag-moves-only-the-stamp-source-and-keeps-tracking-keys",
"native-osc-stamp-resizes-coverage-without-rotation-handle-or-track-changes",
"native-osc-stamp-target-move-saves-the-canvas-key-with-a-different-action-time",
"native-osc-stamp-forward-action-starts-the-existing-host-tracker",
"native-osc-stamp-rejected-write-keeps-the-draft-and-existing-document",
"native-osc-stamp-retries-with-the-same-source-and-saves-once",
"native-osc-untracked-stamp-target-saves-in-place-with-a-different-action-time"
]
}
+143
查看文件
@@ -0,0 +1,143 @@
{
"status": "passed",
"version": "1.14.0",
"build": "90",
"compiledSource": "810bbf4dfb0a05bc2fa66da546ca75b9610985a3",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"host": "Final Cut Pro 12.4",
"hostPID": 46124,
"servicePID": 46136,
"nativeChecks": 881,
"sourceRecovery": {
"trackedFiles": 624,
"exactRemoteTree": true,
"strictFsck": true
},
"live": {
"project": "Existing local QA copy, same real footage",
"analysisSourceSize": [
3840,
2160
],
"referenceTime": 4.626,
"interim": {
"build": "89",
"forwardPairedAfterColdReopen": 142,
"bidirectionalPaired": 257,
"legacyAutomaticTailTime": 10.272333333333334,
"offsetAfterLastPairedFrame": 0.006333333333333333
},
"bidirectionalStatus": "双向跟踪完成 · 257 个轨迹键",
"pairedKeys": 257,
"legacyKeys": 0,
"consecutiveFrameStep": "1/25",
"first": {
"time": 0.026,
"targetCenter": [
0.6588301062583923,
0.2833344340324402
],
"sourceCenter": [
0.6876533504527494,
0.5160227972213454
],
"sourceScale": [
0.5156978964805603,
0.6987575888633728
],
"targetScale": [
0.819161593914032,
0.8457567691802979
]
},
"reference": {
"time": 4.626,
"targetCenter": [
0.6999750733375549,
0.32428178191185
],
"sourceCenter": [
0.7436891075175688,
0.6246055322829909
],
"sourceScale": [
1.0,
1.0
],
"targetScale": [
1.0,
1.0
]
},
"last": {
"time": 10.266,
"targetCenter": [
0.7663808465003967,
0.341084748506546
],
"sourceCenter": [
0.8345088835757658,
0.7266275840942091
],
"sourceScale": [
1.3865485191345215,
1.6888312101364136
],
"targetScale": [
1.1685776710510254,
1.2025887966156006
]
}
},
"native": [
{
"error": "未提供错误信息",
"keys": 6,
"name": "host-clone-stamp-follows-two-independent-centers-and-scales",
"pass": true,
"source": [
0.2265399992465973,
0.5261463522911072,
0.32,
0.54
],
"sourceScale": [
0.8747966289520264,
0.8752831220626831
],
"target": [
0.7812566161155701,
0.48039546608924866
],
"targetScale": [
1.1745620965957642,
1.1744060516357422
]
},
{
"name": "host-clone-stamp-restarts-from-current-paired-scale",
"pass": true
},
{
"name": "host-clone-stamp-source-loss-stops-both-tracks-at-last-paired-frame",
"pass": true
},
{
"name": "clone-stamp-relative-scale-remaps-source-and-expands-target-coverage",
"pass": true
},
{
"name": "clone-stamp-fractional-zoom-interpolates-adjacent-source-pixels",
"pass": true
},
{
"name": "clone-stamp-equal-zoom-preserves-pixel-exact-copy",
"pass": true
},
{
"name": "clone-stamp-replaces-same-frame-automatic-keys-from-offset-host-clock",
"pass": true
}
],
"scope": "Real FCP bidirectional analysis and saved preset readback, plus installed native callback and Metal pixel checks. Cold reopen persistence checked on build 89; build 90 reran the same authored stamp and verified the corrected boundary. No separate Motion host run."
}
+16
查看文件
@@ -0,0 +1,16 @@
{
"status": "passed",
"version": "1.13.2",
"build": "86",
"compiledSource": "db6b2b05b3ee2ad40a6aeab70017a2b121caa67d",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"host": "Final Cut Pro 12.4",
"hostPID": 36280,
"servicePID": 36306,
"nativeChecks": 864,
"qaProject": "1.12.0_76_OpenCV真实帧跟踪 2, independent QA copy",
"inspectorVersion": "1.13.2",
"effectOutputHistogramSamples": 57600,
"registrationIntegrity": "verified",
"scope": "Cold Final Cut Pro launch, existing QA project, inspector and live effect output."
}
+71
查看文件
@@ -0,0 +1,71 @@
{
"version": "1.15.0",
"build": 96,
"fcpxmlVersion": "1.12",
"fcpVersion": "12.4",
"library": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/level-1.15.0/未命名.fcpbundle",
"source": "a2a6e57c13977ea2fc313f91b4d765ea86498f10",
"formalInstall": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"nativeChecks": 898,
"nativeLevelChecks": [
{
"error": "未提供错误信息",
"maximumError": 0.000701652736436964,
"minimumAlpha": 1,
"name": "level-metal-inverse-rotation-and-full-corner-coverage",
"pass": true
},
{
"name": "level-spatial-transform-is-refused-by-cube-export",
"pass": true
},
{
"name": "level-osc-two-points-horizontal-one-undo",
"pass": true
},
{
"name": "level-osc-reset-and-vertical-drag-each-create-one-undo",
"pass": true
},
{
"name": "level-osc-escape-discards-uncommitted-point",
"pass": true
}
],
"staticTemplateChecks": [
"one custom inspector publication on each starter",
"no copyright rig or publication",
"no content object selected",
"no external media"
],
"hostChecks": {
"discovery": [
"大鱼调色",
"一级调色",
"HSL"
],
"initialModules": {
"一级调色": [
"一级调色"
],
"HSL": [
"HSL 混色"
],
"大鱼调色": [
"一级调色",
"蜘蛛盘校色仪",
"基础调整",
"HSL 混色"
]
},
"darkInspector": true,
"workspaceModuleAdds": {
"一级调色": "HSL 混色 1",
"HSL": "曲线 1"
},
"viewerToolbar": "new leveling icon and control panel visible in FCP",
"rotation": "An 8-degree tilted opaque test grid straightened via a -8 degree full preset. Viewer filled all corners.",
"reopen": "FCP was quit normally and the independent library reopened. The same grid remained leveled on a different frame."
},
"scope": "Test library and synthetic grid. Automated UI clicks did not enter live FxPlug OSC callbacks. Actual gesture callbacks, reset, Esc and undo were exercised in the installed native self-test. Manual host gesture is pending."
}
@@ -0,0 +1,99 @@
{
"version": "1.14.3",
"build": "94",
"compiledSource": "6515e0fa67511a7c5ba2cc3320b7c5d9688c41a3",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"host": "Final Cut Pro 12.4",
"sourceRecovery": {
"trackedFiles": 627,
"exactRemoteTree": true,
"strictFsck": true
},
"offlineReplay": {
"reference": "verification/HostCloneTracking1.14.0.json",
"frames": 257,
"sourceSize": [
3840,
2160
],
"metric": "RMS second frame difference of the two coordinate axes, or of the two log relative zoom values",
"targetCenterPixels": {
"before": 2.4323,
"after": 0.9187
},
"sourceCenterPixels": {
"before": 2.7051,
"after": 0.9482
},
"relativeZoomLogPercent": {
"before": 0.6032,
"after": 0.1976
}
},
"liveBuild93": {
"source": "Independent FCP project copy, 4K real footage, trimmed 25 fps timeline",
"playheadBefore": "00:00:04:15",
"playheadAfter": "00:00:04:15",
"stamp": {
"observedCompletedFrames": [
1,
76,
136,
190
],
"total": 190,
"pairedKeys": 190,
"outlinedRegions": [
"source",
"target"
]
},
"rectangle": {
"observedCompletedFrames": [
4,
92,
190
],
"total": 190,
"keys": 190,
"outlinedRegions": [
"mask"
]
},
"savedPresetReadback": {
"firstSourceTime": "68/25",
"lastSourceTime": "257/25",
"frameStep": "1/25",
"continuous": true
},
"previewClippedToImageArea": true,
"switchingMasksRestoredScopes": true,
"remainingAtBuild93": "Native animated progress bar visibly lagged its frame count during analysis."
},
"status": "passed",
"nativeChecks": 893,
"hostPID": 50718,
"servicePID": 50748,
"liveBuild94": {
"stamp": {
"completed": 190,
"total": 190,
"finalSourceTime": 2.72,
"visualSourceAndTarget": true
},
"rectangle": {
"completed": 190,
"total": 190,
"sampleProgress": {
"completed": 96,
"sourceTime": 8.4,
"percent": 51
},
"visualFillMatchesCount": true
},
"finalPreviewRetained": true,
"coldReopenShowsBothObjects": true,
"pluginKitPathVerified": true
},
"scope": "Final Cut Pro 12.4 on this Mac. Native checks include cancellation, forward/reverse single-step seeking, paired frame geometry, and the production Metal rendering path."
}
+214 -16
查看文件
@@ -1,6 +1,6 @@
{
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
"checks": 858,
"checks": 898,
"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/43342CDC-DEEF-4487-9FEF-F4A233D94A2F"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/FF654642-91AD-42B7-BAFA-791895BA8E14"
},
{
"descriptors": 285,
@@ -898,7 +898,7 @@
"error": "未提供错误信息",
"name": "renderer-export-33cube",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/43342CDC-DEEF-4487-9FEF-F4A233D94A2F/diagnostic-export.cube"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/FF654642-91AD-42B7-BAFA-791895BA8E14/diagnostic-export.cube"
},
{
"bytes": 1186074,
@@ -917,8 +917,8 @@
"pass": true
},
{
"heartbeats": 0,
"maximumGapMS": 66.2716249935329,
"heartbeats": 1,
"maximumGapMS": 67.68420833395794,
"name": "external-activation-main-loop-responsive",
"pass": true
},
@@ -1389,7 +1389,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/43342CDC-DEEF-4487-9FEF-F4A233D94A2F/workspace-topbar.png",
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/FF654642-91AD-42B7-BAFA-791895BA8E14/workspace-topbar.png",
"toolbarPixels": 3557
},
{
@@ -1410,6 +1410,14 @@
"pass": true,
"toolbarPixels": 3557
},
{
"name": "workspace-tracking-preview-replaces-scopes-with-readable-progress-and-image",
"pass": true
},
{
"name": "workspace-preview-stop-routes-to-analysis-and-dismiss-restores-scopes",
"pass": true
},
{
"name": "workspace-reopens-existing-host-remote-window",
"pass": true
@@ -1452,7 +1460,7 @@
},
{
"name": "workspace-independent-style-fixture-inserted",
"node": "114C53DA-9F1B-4067-A3C0-C7A8C6B7F724",
"node": "8A385D4A-28A0-4E5B-B258-7B5F7B2F48B5",
"pass": true,
"validDocument": true
},
@@ -1461,10 +1469,10 @@
"error": "none",
"name": "workspace-independent-style1-writes-target-node-inside-undo",
"nodePaths": {
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/43342CDC-DEEF-4487-9FEF-F4A233D94A2F/node.cube"
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/FF654642-91AD-42B7-BAFA-791895BA8E14/node.cube"
},
"pass": true,
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/43342CDC-DEEF-4487-9FEF-F4A233D94A2F/user-new.cube",
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/FF654642-91AD-42B7-BAFA-791895BA8E14/user-new.cube",
"undoStartsAfter": 3,
"undoStartsBefore": 2,
"written": true
@@ -2648,6 +2656,10 @@
"name": "host-callback-opencv-tracking-six-exact-frames",
"pass": true
},
{
"name": "mask-analysis-emits-matching-frame-geometry-and-completed-progress",
"pass": true
},
{
"name": "tracking-results-use-one-undo-action",
"pass": true
@@ -2676,6 +2688,10 @@
"name": "bidirectional-passes-share-reference-and-merge-once",
"pass": true
},
{
"name": "bidirectional-progress-counts-reference-once-and-never-regresses",
"pass": true
},
{
"name": "backward-single-step-includes-reference-and-one-neighbor",
"pass": true
@@ -2742,12 +2758,48 @@
"name": "shared-mask-inspector-alias-activates-canvas-and-receives-canonical-status",
"pass": true
},
{
"name": "clone-analysis-preview-displays-both-regions-on-the-same-frame",
"pass": true
},
{
"error": "未提供错误信息",
"keys": 6,
"name": "host-clone-stamp-follows-two-independent-centers-and-scales",
"pass": true,
"source": [
0.2265399992465973,
0.5261463522911072,
0.32,
0.54
],
"sourceScale": [
0.8747966289520264,
0.8752831220626831
],
"target": [
0.7812566161155701,
0.48039546608924866
],
"targetScale": [
1.1745620965957642,
1.1744060516357422
]
},
{
"name": "host-clone-stamp-restarts-from-current-paired-scale",
"pass": true
},
{
"name": "host-clone-stamp-source-loss-stops-both-tracks-at-last-paired-frame",
"pass": true
},
{
"name": "canvas-cold-load-selects-saved-mask-from-immutable-snapshot",
"pass": true
},
{
"coveredPixels": 15135,
"coveredPixels": 16088,
"name": "native-osc-real-metal-overlay-transparent-around-controls",
"pass": true
},
@@ -2827,17 +2879,62 @@
},
{
"name": "native-osc-renders-the-cropped-toolbar-on-a-transparent-texture",
"opaquePixels": 11311,
"opaquePixels": 12264,
"pass": true
},
{
"name": "native-osc-stamp-preview-survives-async-save-and-different-render-time",
"pass": true
},
{
"name": "native-osc-creates-one-stamp-and-one-undo-from-source-click-and-drag",
"pass": true
},
{
"name": "native-osc-stamp-selects-saved-overlay-when-action-time-differs",
"pass": true
},
{
"keys": 2,
"name": "native-osc-drag-moves-only-the-stamp-source-and-keeps-tracking-keys",
"part": 7,
"pass": true,
"source": [
0.35,
0.35,
0.20000000298023224,
0.20000000298023224
],
"undoGroups": 1
},
{
"name": "native-osc-escape-cancels-the-stamp-source-drag-without-another-undo",
"pass": true
},
{
"name": "native-osc-stamp-resizes-coverage-without-rotation-handle-or-track-changes",
"pass": true
},
{
"name": "native-osc-stamp-target-move-saves-the-canvas-key-with-a-different-action-time",
"pass": true
},
{
"name": "native-osc-stamp-forward-action-starts-the-existing-host-tracker",
"pass": true
},
{
"name": "native-osc-stamp-rejected-write-keeps-the-draft-and-existing-document",
"pass": true
},
{
"name": "native-osc-stamp-retries-with-the-same-source-and-saves-once",
"pass": true
},
{
"name": "native-osc-untracked-stamp-target-saves-in-place-with-a-different-action-time",
"pass": true
},
{
"name": "inspector-add-pen-enters-empty-drawing-mode",
"pass": true
@@ -4031,7 +4128,7 @@
"pass": true
},
{
"name": "viewer-lower-right-rail-has-six-image-tools-and-three-persistent-mask-shapes",
"name": "viewer-lower-right-rail-has-seven-image-tools-and-three-persistent-mask-shapes",
"pass": true
},
{
@@ -4039,10 +4136,10 @@
"pass": true
},
{
"canvasPixelFraction": 0.016155478395061727,
"canvasPixelFraction": 0.017447916666666667,
"name": "viewer-idle-4k-toolbar-rasterizes-under-five-percent-of-the-canvas",
"overlayHeight": 134,
"overlayWidth": 1000,
"overlayWidth": 1080,
"pass": true
},
{
@@ -4164,7 +4261,7 @@
{
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/43342CDC-DEEF-4487-9FEF-F4A233D94A2F/viewer-workspace.png"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/FF654642-91AD-42B7-BAFA-791895BA8E14/viewer-workspace.png"
},
{
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
@@ -4327,6 +4424,84 @@
"name": "clone-stamp-tracked-target-moves-while-sampling-the-same-source",
"pass": true
},
{
"name": "clone-stamp-ignores-legacy-tracking-scale-and-rotation",
"pass": true
},
{
"error": "未提供错误信息",
"name": "clone-stamp-resized-production-render",
"pass": true
},
{
"name": "clone-stamp-resize-extends-coverage-with-pixel-exact-translation",
"pass": true
},
{
"name": "clone-stamp-interpolates-both-centers-and-coverage-scale",
"pass": true
},
{
"error": "未提供错误信息",
"name": "clone-stamp-paired-scale-production-render",
"pass": true
},
{
"name": "clone-stamp-relative-scale-remaps-source-and-expands-target-coverage",
"pass": true
},
{
"name": "clone-stamp-fractional-zoom-interpolates-adjacent-source-pixels",
"pass": true
},
{
"error": "未提供错误信息",
"name": "clone-stamp-equal-scale-production-render",
"pass": true
},
{
"name": "clone-stamp-equal-zoom-preserves-pixel-exact-copy",
"pass": true
},
{
"error": "未提供错误信息",
"name": "clone-stamp-fractional-translation-at-unit-zoom",
"pass": true
},
{
"error": "未提供错误信息",
"name": "clone-stamp-fractional-translation-near-unit-zoom",
"pass": true
},
{
"name": "clone-stamp-fractional-translation-is-continuous-through-unit-zoom",
"pass": true
},
{
"error": "未提供错误信息",
"name": "clone-stamp-fractional-source-crossing-image-edge",
"pass": true
},
{
"name": "clone-stamp-source-fades-continuously-at-image-edge",
"pass": true
},
{
"name": "clone-stamp-retracking-updates-paired-data-without-overwriting-manual-target",
"pass": true
},
{
"name": "clone-stamp-replaces-same-frame-automatic-keys-from-offset-host-clock",
"pass": true
},
{
"name": "clone-stamp-smooths-both-positions-and-log-scales-and-keeps-analysis-endpoints",
"pass": true
},
{
"name": "clone-stamp-smoothing-is-independent-of-analysis-direction",
"pass": true
},
{
"error": "未提供错误信息",
"name": "clone-stamp-disabled-render",
@@ -4339,8 +4514,31 @@
{
"name": "clone-stamp-spatial-state-refuses-static-cube-export",
"pass": true
},
{
"error": "未提供错误信息",
"maximumError": 0.000701652736436964,
"minimumAlpha": 1,
"name": "level-metal-inverse-rotation-and-full-corner-coverage",
"pass": true
},
{
"name": "level-spatial-transform-is-refused-by-cube-export",
"pass": true
},
{
"name": "level-osc-two-points-horizontal-one-undo",
"pass": true
},
{
"name": "level-osc-reset-and-vertical-drag-each-create-one-undo",
"pass": true
},
{
"name": "level-osc-escape-discards-uncommitted-point",
"pass": true
}
],
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/43342CDC-DEEF-4487-9FEF-F4A233D94A2F",
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/FF654642-91AD-42B7-BAFA-791895BA8E14",
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
}
+35
查看文件
@@ -0,0 +1,35 @@
{
"version": "1.13.2",
"build": "86",
"compiledSource": "db6b2b05b3ee2ad40a6aeab70017a2b121caa67d",
"staticVerification": {
"installedOfficialBundle": "passed",
"unchangedRedistributedBundle": "passed",
"adHocWrapper": "rejected, OSStatus -67050",
"unsignedService": "rejected, OSStatus -67062",
"adHocService": "rejected, OSStatus -67021",
"modifiedMetalResource": "rejected, OSStatus -67054"
},
"serviceStartup": {
"officialFinalCut": "passed, see HostIntegrity1.13.2.json",
"adHocWrapperWithOriginalService": "explicit refusal, exit 78",
"detachedOriginalService": "explicit refusal, exit 78",
"modifiedMetalResource": "one direct launch stopped before producing application output with signal 9; the static verifier independently refused the file",
"adHocService": "static refusal confirmed; direct launch did not return a diagnostic within the test window"
},
"registration": {
"officialApp": "registered from the formal path; only one com.dayu.color.XPC result",
"rejectionTests": "Ran the production removal method with isolated mocked PlugInKit responses. It removes and rechecks the exact path, preserves a different path, reports unsuccessful read-back, and skips symbolic links."
},
"update": {
"officialApp": "production HTTPS check completed and reported current version up to date",
"untrustedNativeProcess": "entered integrity_rejected and created no URLSession task; download, install, cancel and another check did not re-enable it",
"updaterContract": "66 checks passed with the signed, notarized 1.12.0 update package, including corrupt checksum refusal",
"serverPolicy": "Existing automatic update endpoint and distribution policy preserved. Integrity enforcement runs locally."
},
"recovery": {
"independentCheckout": "618 files, clean checkout, exact Git tree, strict fsck passed",
"independentReleaseTagCheckout": "621 files, clean checkout, exact Git tree, strict fsck and installer record passed",
"scope": "Verified independently retrieved build inputs. No second full build."
}
}
+133
查看文件
@@ -0,0 +1,133 @@
{
"status": "passed",
"version": "1.14.4",
"build": "95",
"compiledSource": "9f5f0659774c8c05e2640db0d62fb61cb529734e",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"macOS": "27.0.1",
"mainApp": {
"registered": true,
"integrity": "verified",
"pid": 55667,
"executable": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色"
},
"host": {
"version": "12.4",
"hostPID": 55699,
"servicePID": 55724,
"serviceExecutable": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service",
"qaProject": "1.12.0_76_OpenCV真实帧跟踪 2",
"observed": "Existing enabled effect, native inspector, separate control panel and playback of the QA project.",
"playbackFrom": "00:00:03:07",
"playbackTo": "00:00:10:15"
},
"nativeChecks": 893,
"scopeComparison": {
"Original official bundle": {
"launch": "0 -",
"updatePackage": "0 -"
},
"Unsealed installer file": {
"launch": "0 -",
"updatePackage": "-67054 wrapper"
},
"Altered Metal resource": {
"launch": "0 -",
"updatePackage": "-67054 service"
},
"Modified wrapper executable": {
"launch": "-67061 wrapper",
"updatePackage": "-67061 wrapper"
},
"Modified service executable": {
"launch": "-67061 service",
"updatePackage": "-67061 service"
},
"Ad hoc wrapper": {
"launch": "-67050 wrapper",
"updatePackage": "-67050 wrapper"
},
"Ad hoc service": {
"launch": "-67050 service",
"updatePackage": "-67021 wrapper"
},
"Missing service": {
"launch": "-67068 service",
"updatePackage": "-67054 wrapper"
},
"Signed service from build 90": {
"launch": "-67050 component-build",
"updatePackage": "-67050 component-build"
},
"Modified wrapper Info.plist": {
"launch": "-67030 wrapper",
"updatePackage": "-67030 wrapper"
}
},
"originalBuild94Package": {
"sha256": "6df64ae33f99bab95f8dc4e80d70a717fb210b35f90ce52cb38d47d814e709f4",
"unmodifiedPayloadPassedExistingStrictCheckLocally": true,
"embeddedChains": "Wrapper and service each include Apple Root CA, Developer ID intermediate and Developer ID Application leaf. Both pass a separate code-signing certificate-chain trust evaluation using system roots with no user keychains or network.",
"affectedUserFailureStage": "The user-provided repair record reports four unreadable resources and a separate copy under /Applications. The original signed PKG independently confirms four root:wheel 0700 resources. Simulated read denial reproduced strict validation failure. Exact on-device OSStatus unavailable.",
"permissionFailure": {
"affectedFiles": [
{
"path": "Contents/Resources/Basis_balanceWheel.png",
"mode": "0700",
"owner": "root",
"group": "wheel"
},
{
"path": "Contents/Resources/FCP Templates/large.png",
"mode": "0700",
"owner": "root",
"group": "wheel"
},
{
"path": "Contents/Resources/FCP Templates/small.png",
"mode": "0700",
"owner": "root",
"group": "wheel"
},
{
"path": "Contents/Resources/FCP Templates/大鱼调色.moef",
"mode": "0700",
"owner": "root",
"group": "wheel"
}
],
"unreadableResourceSimulation": 1,
"unreadableDetail": "--prepared:<app>/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n--prepared:<app>/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/Frameworks/PluginManager.framework/Versions/Current/.\n--validated:<app>/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/Frameworks/PluginManager.framework/Versions/Current/.\n--prepared:<app>/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/Frameworks/FxPlug.framework/Versions/Current/.\n--validated:<app>/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/Frameworks/FxPlug.framework/Versions/Current/.\n--validated:<app>/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n<app>: Permission denied",
"sameSignedBundleAfter0644": "strict codesign passed without re-signing"
},
"targetPath": "The PKG payload and postinstall use /Library/Plug-Ins/FxPlug/大鱼调色.app and disable bundle relocation. No payload entry places the app under /Applications."
},
"sourceRecovery": {
"independentClone": true,
"exactTree": "95ab6753ac6ecae8e3d0bf6927034ad8486740e2",
"trackedFiles": 633,
"strictFsck": true
},
"resourceModeFix": {
"mode": "0644",
"normalizationSource": "tools/deliver.py",
"installedFormalBundle": "Four modes corrected in place without re-signing. Deep strict verification, stapled ticket and Gatekeeper all passed again.",
"packageGate": "Packaging/build_pkg.py checks both the source APP modes and the exact package BOM."
},
"finalPackage": {
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.14.4.pkg",
"bytes": 45381319,
"sha256": "d9184b1ee1f44723e4fe9fa87c76878884dc8a4fe5c421712650852b0b2ece59",
"notarization": {
"message": "Successfully received submission info",
"status": "Accepted",
"createdDate": "2026-11-06T02:43:36.819Z",
"name": "大鱼调色-1.14.4.pkg",
"id": "3a7eda14-7386-45ec-88fc-5c7676eca2e8"
},
"payloadBundleAccess": {
"entries": 134,
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
}
}
}
+29 -19
查看文件
@@ -1,7 +1,7 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.13.0.pkg",
"sha256": "7999233dd4a3b797a879cc0f37a20f0c35f925c5f6823720b40e684464a452e8",
"bytes": 45350463,
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.15.0.pkg",
"sha256": "3cf708b5fe3f42013b1c2ab4b714978068446cada167ef8d67ee9efdc449c257",
"bytes": 46649171,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
@@ -31,34 +31,44 @@
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.13.0",
"build": "83"
"version": "1.15.0",
"build": "96"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.3096d1a9-4762-4f62-a5ea-d6b46ca46b00/750034C8-E764-4D93-BB06-C37F6DF017D8/大鱼调色"
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-pw0qs7cv/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.040d33dd-3eab-417f-a5e4-c21041bd6f71/47470D00-2CE4-4B79-A75C-4233F0D84F1A/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.13.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-05 14:03:12 +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.13.0.pkg: accepted\nsource=Notarized Developer ID",
"signature": "Package \"大鱼调色-1.15.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 03:45:05 +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.15.0.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": {
"createdDate": "2026-11-05T14:03:14.012Z",
"id": "13d6f418-4d36-4ef8-a92d-591610cb7682",
"name": "大鱼调色-1.13.0.pkg",
"message": "Successfully received submission info",
"createdDate": "2026-11-06T03:45:07.555Z",
"status": "Accepted",
"message": "Successfully received submission info"
"name": "大鱼调色-1.15.0.pkg",
"id": "d92ced8c-21c3-4970-aa07-b623c10b4e4d"
},
"appCompiledSource": "9977b5c41b07e0b08e6408c492498ba6e396c981",
"appBuild": "83",
"appCompiledSource": "a2a6e57c13977ea2fc313f91b4d765ea86498f10",
"appBuild": "96",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"templateSHA256": {
"大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
"一级调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"一级调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
"HSL/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"HSL/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
},
"installedAppHostAcceptance": "verification/HostCloneStamp1.13.0.json",
"payloadBundleAccess": {
"entries": 142,
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
},
"installedAppHostAcceptance": "verification/HostLevel1.15.0.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
}
+33 -13
查看文件
@@ -1,19 +1,39 @@
{
"passResult": true,
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.12.1-canvas-inspector-20261105",
"releaseCommit": "9f0adbeb3b1b902b66ac4be7169b919f82675f21",
"releaseID": 390,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.12.1-canvas-inspector-20261105",
"prerelease": true,
"assetID": 34,
"assetName": "大鱼调色-1.12.1.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.12.1-canvas-inspector-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.12.1.pkg",
"bytes": 45337206,
"sha256": "ae65ac0dcaf7cead701b8ac543ee60ae62e55fd9e19646877d5ef9d9d7351b6f",
"draftVerification": "Full authenticated browser download, byte count and SHA-256",
"passResult": true,
"tag": "v1.14.4-install-permissions-20261106",
"releaseCommit": "a7926f7e13ef19ade42c2cd898c353a9a37fb8f9",
"releaseID": 396,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.14.4-install-permissions-20261106",
"assetID": 40,
"assetName": "大鱼调色-1.14.4.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.14.4-install-permissions-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.14.4.pkg",
"bytes": 45381319,
"sha256": "d9184b1ee1f44723e4fe9fa87c76878884dc8a4fe5c421712650852b0b2ece59",
"existingAssetReused": true,
"verification": "Full Edge draft download checked before publication. Published attachment was downloaded again through the authenticated helper and through the public URL without credentials. All three downloads matched size and SHA-256.",
"credentialSource": "macOS Keychain: dayu-git-api",
"verification": "Published attachment downloaded again and verified by size and SHA-256."
"draftBrowserDownload": {
"sourceURL": "https://dayu.media/git/attachments/d9b9b694-25d7-4f2a-84db-1c29b57e399f",
"bytes": 45381319,
"sha256": "d9184b1ee1f44723e4fe9fa87c76878884dc8a4fe5c421712650852b0b2ece59",
"temporaryDownloadRemoved": true
},
"recovery": {
"releaseTagFiles": 635,
"releaseTagTree": "01bc1212ac3b2e153941626e74adfefe92c2d27f",
"strictFsck": true,
"packageRecordMatches": true,
"temporaryCheckoutRemoved": true
},
"deliveryCleanup": {
"formalInstallKept": true,
"oldInstallBackupRemoved": true,
"generatedBuildAppRemoved": true,
"notarizationZIPRemoved": true,
"unpublishedPermissionCandidateRemoved": true,
"packageInspectionAndDownloadCopiesRemoved": true
}
}
+6
查看文件
@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
34A97A301E774BF3A13BC6A1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A97A301E774BF3A13BC6A3 /* Security.framework */; };
34A97A301E774BF3A13BC6A2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A97A301E774BF3A13BC6A3 /* Security.framework */; };
04962E563095058F009952AA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04962E553095058F009952AA /* Cocoa.framework */; };
04962E5E3095058F009952AA /* 大鱼调色 XPC Service.pluginkit in Embed PlugIns */ = {isa = PBXBuildFile; fileRef = 04962E5D3095058F009952AA /* 大鱼调色 XPC Service.pluginkit */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
04962E623095058F009952AA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04962E613095058F009952AA /* Foundation.framework */; };
@@ -39,6 +41,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
34A97A301E774BF3A13BC6A3 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
04962E523095058F009952AA /* 大鱼调色.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "大鱼调色.app"; sourceTree = BUILT_PRODUCTS_DIR; };
04962E553095058F009952AA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
04962E5D3095058F009952AA /* 大鱼调色 XPC Service.pluginkit */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "大鱼调色 XPC Service.pluginkit"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -153,6 +156,7 @@
isa = PBXFrameworksBuildPhase;
files = (
04962E563095058F009952AA /* Cocoa.framework in Frameworks */,
34A97A301E774BF3A13BC6A1 /* Security.framework in Frameworks */,
);
};
04962E583095058F009952AA /* Frameworks */ = {
@@ -163,6 +167,7 @@
04962E623095058F009952AA /* Foundation.framework in Frameworks */,
04962E643095058F009952AA /* AppKit.framework in Frameworks */,
04962E6A3095058F009952AA /* FxPlug.framework in Frameworks */,
34A97A301E774BF3A13BC6A2 /* Security.framework in Frameworks */,
);
};
/* End PBXFrameworksBuildPhase section */
@@ -195,6 +200,7 @@
04962E653095058F009952AA /* Accelerate.framework */,
04962E673095058F009952AA /* PluginManager.framework */,
04962E693095058F009952AA /* FxPlug.framework */,
34A97A301E774BF3A13BC6A3 /* Security.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -80,7 +80,7 @@ if(faceFixture.length){
p.centerX=48.5f/w;p.centerY=24.5f/h;p.width=.25f;p.height=.25f;
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
stamp[@"stampSource"]=@[@(16.5f/w),@(12.5f/h),@.25,@.25];
CMTime next=CMTimeMake(1,25);DYMaskParameters moved=p;moved.centerY=34.5f/h;
CMTime next=CMTimeMake(1,25);DYMaskParameters moved=p;moved.centerY=34.5f/h;moved.width=.5f;moved.height=.12f;moved.angle=.65f;
run.record(@"clone-stamp-preserves-source-through-tracking-merge",DYMergeTracking(stamp,@[DYMaskKey(kCMTimeZero,p,NO,1),DYMaskKey(next,moved,NO,1)])&&[stamp[@"stampSource"] count]==4);
auto frame=[&](CMTime t,NSString *label){
NSError *failure=nil;
@@ -94,9 +94,171 @@ if(faceFixture.length){
run.record(@"clone-stamp-copies-pixels-and-leaves-exterior-intact",pixel(first,48,24,baseline,16,12)<.002&&pixel(first,0,0,baseline,0,0)==0&&pixel(first,16,12,baseline,16,12)==0);
Pixels second=frame(next,@"clone-stamp-tracked-production-render");
run.record(@"clone-stamp-tracked-target-moves-while-sampling-the-same-source",pixel(second,48,34,baseline,16,12)<.002&&pixel(second,48,24,baseline,48,24)==0);
DYMaskParameters translated=DYMaskAtTime(stamp,next);
run.record(@"clone-stamp-ignores-legacy-tracking-scale-and-rotation",translated.angle==0&&translated.width==p.width&&translated.height==p.height&&translated.centerY==moved.centerY&&pixel(second,51,35,baseline,19,13)==0);
p.width=.5f;p.height=.35f;p.angle=.55f; // A legacy authored rotation must not rotate copied pixels.
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
Pixels expanded=frame(kCMTimeZero,@"clone-stamp-resized-production-render");
run.record(@"clone-stamp-resize-extends-coverage-with-pixel-exact-translation",pixel(expanded,51,25,baseline,19,13)==0&&pixel(expanded,58,24,baseline,26,12)==0&&pixel(first,58,24,baseline,58,24)==0);
p.width=.25f;p.height=.25f;
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
DYStampMotion startMotion;startMotion.active=true;
DYStampMotion endMotion=startMotion;
endMotion.sourceOffsetX=4.f/w;endMotion.sourceOffsetY=2.f/h;
endMotion.targetScaleX=2.f;endMotion.targetScaleY=2.f;
stamp[@"keys"]=@[DYStampKey(kCMTimeZero,p,NO,1,startMotion),DYStampKey(next,moved,NO,1,endMotion)];
CMTime half=CMTimeMake(1,50);
DYMaskParameters halfway=DYMaskAtTime(stamp,half);
NSArray *halfSource=DYStampSourceAtTime(stamp,half);
run.record(@"clone-stamp-interpolates-both-centers-and-coverage-scale",
fabs(halfway.centerY-29.5f/h)<1e-6&&fabs(halfway.width-.375)<1e-6&&
fabs([halfSource[0] doubleValue]-18.5f/w)<1e-6&&fabs([halfSource[1] doubleValue]-13.5f/h)<1e-6);
Pixels zoomed=frame(next,@"clone-stamp-paired-scale-production-render");
run.record(@"clone-stamp-relative-scale-remaps-source-and-expands-target-coverage",
pixel(zoomed,48,34,baseline,20,14)<.001&&pixel(zoomed,52,38,baseline,22,16)<.001&&
pixel(zoomed,60,34,baseline,26,14)<.001&&pixel(zoomed,0,0,baseline,0,0)==0);
float halfPixel=(baseline[(14*w+22)*4]+baseline[(14*w+23)*4])*.5f;
run.record(@"clone-stamp-fractional-zoom-interpolates-adjacent-source-pixels",
fabs(zoomed[(34*w+53)*4]-halfPixel)<.001);
endMotion.sourceScaleX=2.f;endMotion.sourceScaleY=2.f;
stamp[@"keys"]=@[DYStampKey(next,moved,YES,1,endMotion)];
Pixels equalZoom=frame(next,@"clone-stamp-equal-scale-production-render");
run.record(@"clone-stamp-equal-zoom-preserves-pixel-exact-copy",pixel(equalZoom,52,38,baseline,24,18)==0);
DYStampMotion subpixel=startMotion;
subpixel.sourceOffsetX=.5f/w;
stamp[@"keys"]=@[DYStampKey(next,p,NO,1,subpixel)];
Pixels atUnit=frame(next,@"clone-stamp-fractional-translation-at-unit-zoom");
subpixel.sourceScaleX=1.0002f;
stamp[@"keys"]=@[DYStampKey(next,p,NO,1,subpixel)];
Pixels nearUnit=frame(next,@"clone-stamp-fractional-translation-near-unit-zoom");
float unitPixel=(baseline[(12*w+16)*4]+baseline[(12*w+17)*4])*.5f;
run.record(@"clone-stamp-fractional-translation-is-continuous-through-unit-zoom",
fabs(atUnit[(24*w+48)*4]-unitPixel)<.0004f&&pixel(atUnit,48,24,nearUnit,48,24)<.0004f);
subpixel.sourceOffsetX=-16.5f/w;
subpixel.sourceScaleX=1;
stamp[@"keys"]=@[DYStampKey(next,p,NO,1,subpixel)];
Pixels atEdge=frame(next,@"clone-stamp-fractional-source-crossing-image-edge");
float edgePixel=(baseline[(12*w)*4]+baseline[(24*w+48)*4])*.5f;
run.record(@"clone-stamp-source-fades-continuously-at-image-edge",
fabs(atEdge[(24*w+48)*4]-edgePixel)<.0005f);
stamp[@"keys"]=@[DYStampKey(next,moved,YES,1,endMotion)];
DYMaskParameters differentTarget=moved;differentTarget.centerY=.45f;
endMotion.sourceScaleX=1.25f;
run.record(@"clone-stamp-retracking-updates-paired-data-without-overwriting-manual-target",
DYMergeTracking(stamp,@[DYStampKey(CMTimeMake(2,50),differentTarget,NO,.9,endMotion)])&&
[stamp[@"keys"] count]==1&&DYMaskAtTime(stamp,next).centerY==moved.centerY&&
DYStampMotionAtTime(stamp,next).sourceScaleX==1.25f);
CMTime frameDuration=CMTimeMake(1,25),nearStart=CMTimeMake(-1,150),nearEnd=CMTimeMake(7,150);
CMTime previous=CMTimeMake(-1,25),following=CMTimeMake(2,25),authored=CMTimeMake(1,150);
stamp[@"keys"]=@[DYMaskKey(previous,p,NO,1),DYMaskKey(nearStart,p,NO,1),
DYMaskKey(authored,p,YES,1),DYMaskKey(nearEnd,p,NO,1),DYMaskKey(following,p,NO,1)];
NSArray *pairKeys=@[DYStampKey(kCMTimeZero,p,NO,1,startMotion),DYStampKey(next,moved,NO,1,endMotion)];
BOOL merged=DYMergeTracking(stamp,pairKeys,frameDuration);
NSArray *mergedKeys=stamp[@"keys"];
run.record(@"clone-stamp-replaces-same-frame-automatic-keys-from-offset-host-clock",
merged&&mergedKeys.count==5&&[mergedKeys[0] isEqual:DYMaskKey(previous,p,NO,1)]&&
[mergedKeys[1] isEqual:pairKeys[0]]&&[mergedKeys[2] isEqual:DYMaskKey(authored,p,YES,1)]&&
[mergedKeys[3] isEqual:pairKeys[1]]&&[mergedKeys[4] isEqual:DYMaskKey(following,p,NO,1)]);
NSMutableArray *jitter=[NSMutableArray array];
for(int i=0;i<7;i++){
DYMaskParameters shape=p;
shape.centerX+=i*.01f+(i==3?.04f:0);
DYStampMotion motion=startMotion;
motion.sourceOffsetY=i*.01f+(i==3?.04f:0);
motion.sourceScaleX=expf(i*.02f+(i==3?.08f:0));
motion.targetScaleY=expf(i*-.02f+(i==3?-.08f:0));
[jitter addObject:DYStampKey(CMTimeMake(i,25),shape,NO,.9f,motion)];
}
stamp[@"keys"]=@[];
BOOL stable=DYMergeTracking(stamp,jitter,frameDuration);
NSArray *smoothed=stamp[@"keys"];
CMTime center=CMTimeMake(3,25);
auto filtered=DYStampMotionAtTime(stamp,center);
float expectedSpike=.04f*6/16;
run.record(@"clone-stamp-smooths-both-positions-and-log-scales-and-keeps-analysis-endpoints",
stable&&smoothed.count==7&&[smoothed.firstObject isEqual:jitter.firstObject]&&
[smoothed.lastObject isEqual:jitter.lastObject]&&
fabs(DYMaskAtTime(stamp,center).centerX-p.centerX-.03f-expectedSpike)<1e-6&&
fabs(filtered.sourceOffsetY-.03f-expectedSpike)<1e-6&&
fabs(logf(filtered.sourceScaleX)-.09f)<1e-6&&fabs(logf(filtered.targetScaleY)+.09f)<1e-6);
stamp[@"keys"]=@[];
stable=DYMergeTracking(stamp,jitter.reverseObjectEnumerator.allObjects,frameDuration);
run.record(@"clone-stamp-smoothing-is-independent-of-analysis-direction",stable&&[stamp[@"keys"] isEqual:smoothed]);
stamp[@"enabled"]=@NO;Pixels disabled=frame(next,@"clone-stamp-disabled-render");
run.record(@"clone-stamp-disabled-is-identical",difference(disabled,baseline).maximum==0);
stamp[@"enabled"]=@YES;NSError *failure=nil;
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"unsupported-clone.cube"]];
run.record(@"clone-stamp-spatial-state-refuses-static-cube-export",![renderer exportLUT:cube uniforms:u paths:@{} spider:nil tools:doc error:&failure]&&failure);
}
{
// Sample the real final GPU pass using linear X/Y ramps and opaque alpha.
const NSUInteger w=64,h=36;
DYDiagnosticTile *source=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];
DYDiagnosticTile *destination=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];
Pixels grid(w*h*4);
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){
NSUInteger i=(y*w+x)*4;grid[i]=(x+.5)/w;grid[i+1]=(y+.5)/h;grid[i+2]=.1;grid[i+3]=1;
}
[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h)mipmapLevel:0 withBytes:grid.data() bytesPerRow:w*8];
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];DYUniforms u=DYToolUniforms(@{@"type":@"lens"});
NSMutableDictionary *doc=DYMutablePlist(DYInitialToolDocument(nil));
const double angle=-M_PI/6,aspect=w/double(h),c=cos(angle),s=sin(angle),zoom=c-s*aspect;
doc[@"levelRotation"]=@(angle);
NSError *failure=nil;
BOOL ok=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:nil tools:DYToolRenderSnapshot(doc,kCMTimeZero) colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&failure];
Pixels corrected=read(destination,gpu);
double worst=0,alpha=1;
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){
NSUInteger i=(y*w+x)*4;
double dx=((x+.5)/w-.5)/zoom,dy=((y+.5)/h-.5)/zoom;
double sx=std::clamp(.5+c*dx+s*dy/aspect,.5/w,1-.5/w);
double sy=std::clamp(.5+c*dy-s*dx*aspect,.5/h,1-.5/h);
worst=std::max({worst,fabs(corrected[i]-sx),fabs(corrected[i+1]-sy)});
alpha=MIN(alpha,corrected[i+3]);
}
run.record(@"level-metal-inverse-rotation-and-full-corner-coverage",ok&&worst<.002&&alpha==1,@{@"error":reason(failure),@"maximumError":@(worst),@"minimumAlpha":@(alpha)});
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"unsupported-level.cube"]];
run.record(@"level-spatial-transform-is-refused-by-cube-export",![renderer exportLUT:cube uniforms:u paths:@{} spider:nil tools:doc error:&failure]&&failure);
}
{
DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,nil);
DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero;
id<DYToolCanvasHostProbe> plugin=(id)[[NSClassFromString(@"DYPlugIn")alloc]initWithAPIManager:host];
[plugin scheduleToolCanvasRegistration];
NSData *state=nil;[plugin pluginState:&state atTime:kCMTimeZero quality:(FxQuality)0 error:&error];
auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.07;while(NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.002]];};drain();
id<FxOnScreenControl_v4> osc=(id)[[NSClassFromString(@"DYToolOSC")alloc]initWithAPIManager:host];
DYDiagnosticTile *overlay=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:640 height:400]autorelease];
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
id viewer=[(id)osc valueForKey:@"viewerControls"];
BOOL update=NO;
auto down=[&](double x,double y){
NSInteger part=0;
[osc hitTestOSCAtMousePositionX:x mousePositionY:y activePart:&part atTime:kCMTimeZero];
[osc mouseDownAtPositionX:x positionY:y activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];return part;
};
auto up=[&](double x,double y,NSInteger part){[osc mouseUpAtPositionX:x positionY:y activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];};
auto click=[&](double x,double y){NSInteger part=down(x,y);up(x,y,part);};
auto control=[&](NSInteger part){
for(NSDictionary *a in [viewer valueForKey:@"areas"])if([a[@"part"]integerValue]==part){
NSRect r=[a[@"rect"]rectValue];click(NSMidX(r),400-NSMidY(r));break;
}
};
auto angle=[&](){return [DYReadTools(host,kCMTimeZero).document[@"levelRotation"] doubleValue];};
int undo=base->_undoStarts;
control(20026);
click(150,280);click(390,200);drain();
run.record(@"level-osc-two-points-horizontal-one-undo",fabs(angle()+atan2(80.,240.))<1e-6&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
control(20033);drain();
control(20032);
NSInteger part=down(200,270);up(230,150,part);drain();
run.record(@"level-osc-reset-and-vertical-drag-each-create-one-undo",fabs(angle()-(M_PI_2-atan2(120.,30.)))<1e-6&&base->_undoStarts==undo+3&&base->_undoEnds==undo+3);
double previous=angle();
click(180,200);
BOOL handled=NO;
[osc keyDownAtPositionX:250 positionY:225 keyPressed:27 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];drain();
run.record(@"level-osc-escape-discards-uncommitted-point",handled&&angle()==previous&&base->_undoStarts==undo+3);
[osc release];[plugin release];drain();
}
+27 -1
查看文件
@@ -12,6 +12,7 @@
#include <cmath>
static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[NSButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.bordered=NO;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;}
#include "DYTrackingPreview.inc.h"
static NSString *DYWorkspaceSymbol(NSString *type){return @{@"primary":@"slider.horizontal.3",@"spider":@"circle.hexagongrid",@"base":@"sun.max",@"skin":@"person.crop.circle",@"look":@"square.stack.3d.up",@"hsl":@"paintpalette",@"curve":@"point.topleft.down.to.point.bottomright.curvepath",@"grading":@"circle.lefthalf.filled",@"primaries":@"circle.grid.2x2",@"levels":@"chart.bar",@"blackwhite":@"circle.righthalf.filled",@"balance":@"dial.low",@"mixer":@"slider.vertical.3",@"film":@"film",@"lens":@"camera.aperture"}[type]?:@"square";}
static NSDictionary *DYWorkspacePalette(void){NSMutableDictionary *palette=[[DYThemePalette()mutableCopy]autorelease];BOOL light=DYThemeIsLight();palette[@"background"]=[NSColor colorWithWhite:light?.88:.145 alpha:1];palette[@"card"]=[NSColor colorWithWhite:light?.84:.17 alpha:1];palette[@"field"]=[NSColor colorWithWhite:light?.78:.23 alpha:1];palette[@"border"]=[NSColor colorWithWhite:light?.6:.31 alpha:1];return palette;}
static NSDictionary *DYWorkspaceSection(NSString *type){NSMutableDictionary *section=[[DYToolSection(type)mutableCopy]autorelease];if([type isEqual:@"base"])section[@"extraEnabled"]=DYToolSection(@"color")[@"enabled"];if([type isEqual:@"primary"]){for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"primaryMasterEnabled"])section[@"enabled"]=d[@"pid"];section[@"enableParameters"]=@[DYToolSection(@"input")[@"enabled"],DYToolSection(@"primary")[@"enabled"],DYToolSection(@"output")[@"enabled"]];}return section;}
@@ -38,6 +39,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
@interface DYColorWorkspace (Internal)
- (void)layoutWorkspace;
- (void)scopeChanged:(NSNotification *)notification;
- (void)setTrackingPreviewVisible:(BOOL)visible;
@end
@interface DYWorkspaceLifetime:NSObject
@property(nonatomic,assign) DYColorWorkspace *owner;
@@ -93,6 +95,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
DYRenderer *_renderer;DYLUTLibrary *_library;DYLUTBrowser *_browser;
DYWorkspaceRoot *_root;NSView *_scopePane,*_lutPane;
DYScopePlot *_plot;NSArray *_scopePlots;NSInteger _editorMode;
DYTrackingPreview *_trackingPreview;
NSTextField *_heading,*_description,*_status,*_lutExplanation;
NSButton *_close,*_hostScopes,*_sizeMode;
DYWorkspaceLifetime *_lifetime;
@@ -122,6 +125,9 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
_hostScopes=[DYWorkspaceButton(@"FCP",self,@selector(toggleHostScopes:))retain];_hostScopes.toolTip=@"切换宿主示波器";[_scopePane addSubview:_hostScopes];
_description=[[DYThemeLabel labelWithString:@"示波器 · 显示参考"]retain];_description.font=[NSFont systemFontOfSize:10];[_scopePane addSubview:_description];
NSMutableArray *plots=[NSMutableArray array];for(NSInteger i=0;i<4;i++){DYScopePlot *plot=[[[DYScopePlot alloc]init]autorelease];plot.mode=i;plot.accessibilityRole=NSAccessibilityImageRole;[_scopePane addSubview:plot];[plots addObject:plot];}_scopePlots=[plots copy];_plot=[_scopePlots[0]retain];
_trackingPreview=[[DYTrackingPreview alloc]initWithTarget:self action:@selector(trackingPreviewAction:)];
[_scopePane addSubview:_trackingPreview];
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(trackingPreviewChanged:) name:@"DYToolTrackingStatus" object:[self rootHost]];
_status=[[DYThemeLabel labelWithString:@""]retain];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[_scopePane addSubview:_status];
_lutExplanation=[[DYThemeLabel labelWithString:@""]retain];_lutExplanation.font=[NSFont systemFontOfSize:11];_lutExplanation.stringValue=[NSString stringWithFormat:@"应用位置:%@ · 风格1。缩略图以输入画面预览;示波器查看最终调色结果。",_title];[_root addSubview:_lutExplanation];_lutExplanation.hidden=YES;
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(scopeChanged:) name:@"DYScopeDidChange" object:_renderer];
@@ -133,7 +139,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
}
- (void)dealloc{
[self close];_lifetime.owner=nil;[NSNotificationCenter.defaultCenter removeObserver:self];_root.owner=nil;
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_scopePlots release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release];
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_scopePlots release];[_trackingPreview release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release];
[_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc];
}
- (BOOL)visible{return _visible||_opening;}
@@ -183,8 +189,27 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
_sizingSplit=YES;_split.frame=NSMakeRect(0,36,w,MAX(1,h-36));_sizingSplit=NO;[self layoutToolWorkspace];
_lutPane.frame=_editorHost.bounds;_lutExplanation.hidden=YES;
CGFloat sw=_scopePane.bounds.size.width,sh=_scopePane.bounds.size.height;_description.frame=NSMakeRect(8,3,MAX(1,sw-50),19);_hostScopes.frame=NSMakeRect(sw-40,1,34,21);_status.hidden=YES;
_trackingPreview.frame=_scopePane.bounds;
CGFloat gap=4,pw=MAX(1,(sw-12-gap)/2),ph=MAX(1,(sh-30-gap)/2);for(NSUInteger i=0;i<_scopePlots.count;i++)[_scopePlots[i]setFrame:NSMakeRect(6+(i%2)*(pw+gap),26+(i/2)*(ph+gap),pw,ph)];
}
- (void)setTrackingPreviewVisible:(BOOL)visible {
_trackingPreview.hidden=!visible;_description.hidden=visible;_hostScopes.hidden=visible;
for(DYScopePlot *plot in _scopePlots)plot.hidden=visible;
}
- (void)trackingPreviewChanged:(NSNotification *)note {
NSDictionary *info=note.userInfo;
if(!info[@"tracking"]||(!_visible&&!_opening))return;
BOOL active=[info[@"tracking"] boolValue];
if(active&&_trackingPreview.hidden)[self setTrackingPreviewVisible:YES];
if(!_trackingPreview.hidden)[_trackingPreview applyUpdate:info];
}
- (void)trackingPreviewAction:(id)sender {
if(_trackingPreview.running){
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:[self rootHost] userInfo:@{@"direction":@9}];
}else{
[_trackingPreview reset];[self setTrackingPreviewVisible:NO];
}
}
- (void)pageChanged:(id)sender{
if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=_editorMode==2;
CMTime displayTime=_toolTime;id<FxCustomParameterActionAPI_v4>action=[self actionAPI];if(_visible&&!_renderer.scopeEnabled&&action){[action startAction:self];@try{
@@ -265,6 +290,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
- (void)remoteClosed:(NSNotification *)notification{_closing=YES;[self close];_closing=NO;}
- (void)close{
if(_closed)return;BOOL hadPresentation=_visible||_opening||_remoteParent;_closed=YES;_visible=NO;_opening=NO;_session++;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;[_renderer setScopeEnabled:NO];
[_trackingPreview reset];[self setTrackingPreviewVisible:NO];
BOOL wasClosing=_closing;_closing=YES;[_browser close];[_browser release];_browser=nil;
[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=nil;_maskScroll.documentView=nil;[_maskEditor release];_maskEditor=nil;[_maskNode release];_maskNode=nil;
if(_remoteParent)for(NSNotificationName name in @[NSViewFrameDidChangeNotification,NSViewBoundsDidChangeNotification])[NSNotificationCenter.defaultCenter removeObserver:self name:name object:_remoteParent];_remoteParent=nil;
+29 -9
查看文件
@@ -347,7 +347,7 @@ kernel void dyLensRepair(texture2d<float> source [[texture(0)]],texture2d<float,
constexpr sampler f(coord::normalized,address::clamp_to_zero,filter::linear);output.write(source.sample(f,sample),p);
}
kernel void dyCloneStamps(texture2d<float,access::sample> input [[texture(0)]],
kernel void dyCloneStamps(texture2d<float,access::read> input [[texture(0)]],
texture2d<float,access::write> output [[texture(1)]],
constant DYCloneStamp *stamps [[buffer(0)]],
constant uint &count [[buffer(1)]],
@@ -358,21 +358,41 @@ kernel void dyCloneStamps(texture2d<float,access::sample> input [[texture(0)]],
float2 uv=(float2(gid)+.5f)/float2(size);
if(flip)uv.y=1-uv.y;
float4 color=input.read(gid);
constexpr sampler linearFilter(coord::normalized,address::clamp_to_edge,filter::linear);
for(uint i=0;i<count;i++){
constant DYCloneStamp &stamp=stamps[i];
float2 delta=uv-float2(stamp.centerX,stamp.centerY);
float2 local=float2(dot(delta,float2(stamp.localXX,stamp.localXY)),
dot(delta,float2(stamp.localYX,stamp.localYY)));
float2 center=float2(stamp.centerX,stamp.centerY);
float2 local=(uv-center)*float2(stamp.inverseRadiusX,stamp.inverseRadiusY);
float radiusSquared=dot(local,local);
if(radiusSquared>1)continue;
float2 source=float2(stamp.sourceX,stamp.sourceY)+local*float2(stamp.sourceWidth,stamp.sourceHeight)*.5f;
if(any(source<0)||any(source>1))continue;
if(flip)source.y=1-source.y;
float2 sampleCenter(stamp.sourceX,stamp.sourceY);
float2 sampleScale(stamp.samplingScaleX,stamp.samplingScaleY);
float4 sampled;
float sourceCoverage=1;
float2 offset=(sampleCenter-center+(uv-center)*(sampleScale-1))*float2(size);
if(flip)offset.y=-offset.y;
if(!stamp.subpixel){
// Preserve pixel values for stamps with translation alone.
int2 source=int2(gid)+int2(round(offset));
if(any(source<0)||any(source>=int2(size)))continue;
sampled=input.read(uint2(source));
}else{
// Follow fractional motion through unit zoom and fade the sample
// across the last pixel instead of dropping it at the image edge.
float2 source=float2(gid)+offset;
float2 edge=min(source+1,float2(size)-source);
sourceCoverage=saturate(min(edge.x,edge.y));
if(sourceCoverage<=0)continue;
float2 pixel=clamp(source,0.f,float2(size-1));
uint2 lo=uint2(floor(pixel)),hi=min(lo+1,size-1);
float2 blend=fract(pixel);
float4 top=mix(input.read(lo),input.read(uint2(hi.x,lo.y)),blend.x);
float4 bottom=mix(input.read(uint2(lo.x,hi.y)),input.read(hi),blend.x);
sampled=mix(top,bottom,blend.y);
}
float coverage=stamp.feather>0?1-smoothstep(1-stamp.feather,1.f,sqrt(radiusSquared)):1;
coverage=saturate((coverage-stamp.inputBlack)/(stamp.inputWhite-stamp.inputBlack));
if(stamp.inputGamma!=1)coverage=pow(coverage,1/stamp.inputGamma);
color=mix(color,input.sample(linearFilter,source),coverage*stamp.strength);
color=mix(color,sampled,coverage*stamp.strength*sourceCoverage);
}
output.write(color,gid);
}
+12 -5
查看文件
@@ -610,11 +610,13 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
}
- (void)openWorkspace:(id)sender {
if(_embedded||_workspaceEditor||!self.window||!_renderer)return;
BOOL tracking=[sender isKindOfClass:NSNotification.class]&&[[sender userInfo][@"page"]isEqual:@"tracking"];
if(tracking&&_workspace.visible)return;
[_browser close];
if(!_workspace)_workspace=[[DYColorWorkspace alloc]initWithManager:_manager renderer:_renderer library:_library title:@"大鱼调色 · 当前片段"];
if(_workspaceSelectedNode.length)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:_manager userInfo:@{@"node":_workspaceSelectedNode,@"source":@"inspector"}];
if(!tracking&&_workspaceSelectedNode.length)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:_manager userInfo:@{@"node":_workspaceSelectedNode,@"source":@"inspector"}];
[_workspace showRelativeToView:self];
if([sender isKindOfClass:NSNotification.class])[_workspace showPage:[sender userInfo][@"page"]?:@"tools" maskKind:[sender userInfo][@"maskKind"]];
if(!tracking&&[sender isKindOfClass:NSNotification.class])[_workspace showPage:[sender userInfo][@"page"]?:@"tools" maskKind:[sender userInfo][@"maskKind"]];
}
- (void)rememberWorkspaceSelection:(NSNotification*)note {NSString*node=note.userInfo[@"node"];if(!node.length)return;NSString*saved=[node copy];[_workspaceSelectedNode release];_workspaceSelectedNode=saved;}
- (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];}
@@ -1133,8 +1135,11 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
@try {
CMTime t=action.currentTime;id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
NSError *failure=nil;if(!DYResetToolParameters(_manager,DYDescriptors(),t,&failure)){dispatch_async(dispatch_get_main_queue(),^{[self showError:failure.localizedDescription?:@"未能完整还原参数。"];});return;}
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=@{};DYWriteAssets(_manager,assets,t);DYWriteTools(_manager,[[[DYToolDocument alloc]init]autorelease].document,t);
[set setCustomParameterValue:[[[DYInspectorToken alloc]init]autorelease] toParameter:DYInspectorParameterID atTime:t];
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=@{};DYWriteAssets(_manager,assets,t);NSString *starter=DYReadTools(_manager,t).document[@"starterTool"];
DYWriteTools(_manager,DYInitialToolDocument(starter),t);
DYInspectorToken *token=[[[DYInspectorToken alloc]init]autorelease];
if(starter)token.folds=@{starter:@NO};
[set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:t];
for(NSMutableDictionary *card in _cards)card[@"collapsed"]=@YES;
} @finally {if(grouped)[undo endUndoGroup];[action endAction:self];}
[self postChanged];
@@ -1301,7 +1306,9 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
CMTime t=action.currentTime;id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
for(NSDictionary *d in DYDescriptors()){id value=values[d[@"key"]];if(!value&&[d[@"offset"]integerValue]>=1104)value=d[@"default"];if(value)[set setFloatValue:[value doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:t];}
if([json[@"version"]isEqual:@1]&&!values[@"cmConfigured"]){[set setFloatValue:-1 toParameter:2236 atTime:t];[set setFloatValue:1 toParameter:2270 atTime:t];}
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=validPaths;assets.colorManagement=newCMS.count?newCMS:nil;assets.spiderMesh=mesh;assets.spiderLinked=mesh?[json[@"spider"][@"linked"]boolValue]:YES;DYWriteAssets(_manager,assets,t);DYWriteTools(_manager,tools,t);
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=validPaths;assets.colorManagement=newCMS.count?newCMS:nil;assets.spiderMesh=mesh;assets.spiderLinked=mesh?[json[@"spider"][@"linked"]boolValue]:YES;DYWriteAssets(_manager,assets,t);
restoredTools[@"starterTool"]=DYReadTools(_manager,t).document[@"starterTool"];
DYWriteTools(_manager,restoredTools,t);
} @finally {[action endAction:self];}
[self postChanged];
if(missing.count)[self showError:[@"调色参数已恢复,以下 LUT 文件需要重新选择:\n" stringByAppendingString:[missing componentsJoinedByString:@"\n"]]];
+30
查看文件
@@ -0,0 +1,30 @@
#pragma once
#include <CoreGraphics/CoreGraphics.h>
#include <cmath>
#include <algorithm>
inline double DYLevelDelta(CGPoint first, CGPoint second, double aspect, bool vertical) {
const double angle = std::atan2(second.y - first.y, (second.x - first.x) * aspect);
const double delta = std::remainder((vertical ? M_PI_2 : 0.) - angle, M_PI);
return delta <= -M_PI_2 + 1e-12 ? M_PI_2 : delta;
}
// Coordinates are normalized to a top-down image. Rotation is measured in
// display pixels so the same line aligns in landscape, portrait and anamorphic footage.
struct DYLevelTransform {
double aspect, cosine, sine, zoom;
DYLevelTransform(double angle = 0, double displayAspect = 1)
: aspect(displayAspect), cosine(std::cos(angle)), sine(std::sin(angle)),
zoom(std::max(1., std::abs(cosine) + std::abs(sine) * std::max(aspect, 1. / aspect))) {}
CGPoint toSource(CGPoint output) const {
const double x = (output.x - .5) * aspect / zoom, y = (output.y - .5) / zoom;
return CGPointMake(.5 + (cosine * x + sine * y) / aspect, .5 + cosine * y - sine * x);
}
CGPoint toOutput(CGPoint source) const {
const double x = (source.x - .5) * aspect * zoom, y = (source.y - .5) * zoom;
return CGPointMake(.5 + (cosine * x - sine * y) / aspect, .5 + cosine * y + sine * x);
}
};
+31 -6
查看文件
@@ -30,15 +30,15 @@
std::vector<DYCloneStamp> stamps;
FxRect image=source.imagePixelBounds,bounds=source.tilePixelBounds;
if(image.right<=image.left||image.top<=image.bottom)return source;
float aspect=float(image.right-image.left)/(image.top-image.bottom);
for(NSDictionary *mask in masks){
NSArray *patch=mask[@"stampSource"];
if(!patch||![mask[@"enabled"]boolValue])continue;
DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);
if(p.strength<=0)continue;
float c=cosf(p.angle),s=sinf(p.angle);
stamps.push_back({p.centerX,p.centerY,[patch[0]floatValue],[patch[1]floatValue],[patch[2]floatValue],[patch[3]floatValue],
2*c/p.width,2*s/(p.width*aspect),-2*s*aspect/p.height,2*c/p.height,p.feather,p.strength,p.inputBlack,p.inputWhite,p.inputGamma});
NSArray *scale=mask[@"stampSamplingScale"];
stamps.push_back({p.centerX,p.centerY,[patch[0]floatValue],[patch[1]floatValue],
scale?[scale[0]floatValue]:1.f,scale?[scale[1]floatValue]:1.f,
2/p.width,2/p.height,p.feather,p.strength,p.inputBlack,p.inputWhite,p.inputGamma,scale?1u:0u});
}
if(stamps.empty())return source;
if(image.left!=bounds.left||image.right!=bounds.right||image.top!=bounds.top||image.bottom!=bounds.bottom){
@@ -66,13 +66,38 @@
[tile setBounds:bounds origin:source.imageOrigin];[tile setPixelAspect:source.pixelAspect];[tile inheritColorSpace:source.colorSpace];
return tile;
}
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {
double angle=[tools[@"levelRotation"] doubleValue];
if(!angle)return [self renderColorSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools colorManagement:state hostPrimaries:primaries error:error];
@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
if(!DYValidToolDocument(tools))return fail(error,@"水平校正数据无效");
NSMutableDictionary *entry=[self device:dst.deviceRegistryID error:error];
if(!entry)return NO;
id<MTLDevice>device=entry[@"device"];
FxRect bounds=src.imagePixelBounds;
NSInteger width=bounds.right-bounds.left,height=bounds.top-bounds.bottom;
if(width<=0||height<=0)return fail(error,@"画面尺寸无效");
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:width height:height mipmapped:NO];
desc.storageMode=MTLStorageModePrivate;
desc.usage=MTLTextureUsageRenderTarget|MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;
id<MTLTexture>texture=[device newTextureWithDescriptor:desc];
if(!texture)return fail(error,@"无法分配水平校正缓冲区");
DYExportTile *frame=[[[DYExportTile alloc]initWithTexture:texture registry:device.registryID]autorelease];
[texture release];
[frame setBounds:bounds origin:dst.imageOrigin];
[frame setPixelAspect:src.pixelAspect];
[frame inheritColorSpace:dst.colorSpace];
if(![self renderColorSource:src destination:frame uniforms:u paths:paths spider:spider tools:tools colorManagement:state hostPrimaries:primaries error:error])return NO;
return [self copyTile:frame to:dst rotation:angle entry:entry error:error];
});}
}
- (BOOL)renderColorSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
if(state&&![state isKindOfClass:NSDictionary.class])return fail(error,@"色彩管理状态无效。");
NSDictionary*context=DYHostColorContext(src,dst,primaries);@synchronized(_previewLock){[_colorContext release];_colorContext=[context copy];}
if(tools[@"sharedMasks"]){
if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
FxImageTile *stamped=[self sourceByApplyingStamps:DYSharedMasks(tools) source:src registry:dst.deviceRegistryID error:error];if(!stamped)return NO;
return [self renderSource:stamped destination:dst uniforms:u paths:paths spider:spider tools:DYResolvedToolDocument(tools) colorManagement:state hostPrimaries:primaries error:error];
return [self renderColorSource:stamped destination:dst uniforms:u paths:paths spider:spider tools:DYResolvedToolDocument(tools) colorManagement:state hostPrimaries:primaries error:error];
}
if(!state.count)return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
if(!DYManagedColorValid(state,error))return NO;if(!tools)tools=@{@"schema":@2,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
+20 -4
查看文件
@@ -60,13 +60,13 @@
BOOL stamp=m[@"stampSource"]!=nil;_combine.hidden=_invert.hidden=stamp;
_eye.state=[m[@"enabled"]boolValue]?NSControlStateValueOn:NSControlStateValueOff;_eye.image=[NSImage imageWithSystemSymbolName:[m[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用蒙版"];[_combine selectItemAtIndex:[m[@"combine"]integerValue]];_invert.state=(p.flags&DYMaskInvert)?NSControlStateValueOn:NSControlStateValueOff;
float values[]={p.strength,p.feather,p.centerX,p.centerY,p.width,p.height,float(p.angle*180.f/M_PI),p.gradientWidth,p.hueCenterTurns*360.f,p.hueCoreHalfWidth*360.f,p.hueSoftWidth*360.f,p.saturationRange.low,p.saturationRange.high,p.lightnessRange.low,p.lightnessRange.high,p.inputBlack,p.inputWhite,p.inputGamma};
NSInteger visible=0;for(NSInteger i=0;i<_rows.count;i++){BOOL show=i==0||(i==1&&p.kind<3)||(i>=2&&i<=6&&p.kind<4)||(i==7&&p.kind==3)||(i>=8&&i<=14&&p.kind==4)||(i>=15&&p.kind>=4);NSDictionary *row=_rows[i];for(NSView *v in row.allValues)v.hidden=!show;if(!show)continue;visible++;double lo=0,hi=1;if(i==2||i==3)lo=-1,hi=2;if(i==4||i==5||i==7)lo=.001,hi=2;if(i==6)lo=-180,hi=180;if(i==8)hi=360;if(i==9||i==10)hi=180;if(i==15)hi=.99;if(i==16)lo=.01,hi=2;if(i==17)lo=.01,hi=4;NSSlider *slider=row[@"slider"];slider.minValue=lo;slider.maxValue=hi;slider.doubleValue=values[i];[row[@"field"]setStringValue:[NSString stringWithFormat:@"%.3f",values[i]]];}
NSInteger visible=0;for(NSInteger i=0;i<_rows.count;i++){BOOL show=i==0||(i==1&&p.kind<3)||(i>=2&&i<=6&&p.kind<4&&(!stamp||i!=6))||(i==7&&p.kind==3)||(i>=8&&i<=14&&p.kind==4)||(i>=15&&p.kind>=4);NSDictionary *row=_rows[i];for(NSView *v in row.allValues)v.hidden=!show;if(!show)continue;visible++;double lo=0,hi=1;if(i==2||i==3)lo=-1,hi=2;if(i==4||i==5||i==7)lo=.001,hi=2;if(i==6)lo=-180,hi=180;if(i==8)hi=360;if(i==9||i==10)hi=180;if(i==15)hi=.99;if(i==16)lo=.01,hi=2;if(i==17)lo=.01,hi=4;NSSlider *slider=row[@"slider"];slider.minValue=lo;slider.maxValue=hi;slider.doubleValue=values[i];[row[@"field"]setStringValue:[NSString stringWithFormat:@"%.3f",values[i]]];}
BOOL shape=p.kind<3;for(NSButton *b in _tracking)b.hidden=!shape;_trackingTitle.hidden=!shape;_clear.hidden=!shape;_clear.enabled=[m[@"keys"]count]>0;
BOOL pen=p.kind==DYMaskBezier;_penRedraw.hidden=!pen;_penFinish.hidden=!pen;_penCancel.hidden=!pen;
[self updateDrawingControls];
_status.stringValue=m[@"status"]?:([m[@"keys"]count]?[NSString stringWithFormat:@"%lu 个轨迹键 · 修改几何会在当前帧建立手工键",(unsigned long)[m[@"keys"]count]]:pen?@"重画钢笔后,点击起点或“完成绘制”闭合;取消或 Esc 保留原路径。":@"各蒙版只影响当前工具层");
if([_nodeID isEqual:@"shared"]){_list.accessibilityLabel=@"共享蒙版";_add.toolTip=@"添加共享蒙版";_remove.toolTip=@"删除此共享蒙版及其模块关联,可撤销";if(!m[@"status"]&&!pen&&![m[@"keys"]count])_status.stringValue=[NSString stringWithFormat:@"共享给 %lu 个模块 · 编辑与跟踪同步更新所有关联模块",(unsigned long)DYToolIDsForSharedMask(doc,_maskID).count];}
if(stamp){_remove.toolTip=@"删除仿制图章,可撤销";if(!m[@"status"]&&![m[@"keys"]count])_status.stringValue=@"取样中心固定,跟踪覆盖区域。";}
if(stamp){_remove.toolTip=@"删除仿制图章,可撤销";if(!m[@"status"]&&![m[@"keys"]count])_status.stringValue=@"分别跟踪取样与覆盖区域的位置和缩放。";}
// Keep every scalar readable at the narrowest native inspector width. A
// label/value line and a separate full-width slider avoid compressed controls.
_contentHeight=136+(pen?84:0)+visible*58+(shape?184:0)+58;[self setNeedsLayout:YES];_refreshing=NO;
@@ -101,7 +101,7 @@
- (void)enabled:(NSButton*)sender{[self edit:@"启停蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"enabled"]=@(sender.state==NSControlStateValueOn);}];}
- (void)combine:(id)sender{[self edit:@"蒙版组合" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"combine"]=@(self->_combine.indexOfSelectedItem);}];}
- (void)inverted:(NSButton*)sender{[self edit:@"反转蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p;[m[@"parameters"]getBytes:&p length:sizeof(p)];if(sender.state)p.flags|=DYMaskInvert;else p.flags&=~DYMaskInvert;m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if([sender isKindOfClass:NSTextField.class]){NSString *text=[sender.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&value]||!scanner.isAtEnd){NSBeep();[self refreshWithDocument:_document time:_time];return;}}if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&i<8){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYMaskKey(self->_time,p,YES,1)];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if([sender isKindOfClass:NSTextField.class]){NSString *text=[sender.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&value]||!scanner.isAtEnd){NSBeep();[self refreshWithDocument:_document time:_time];return;}}if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){BOOL stamp=m[@"stampSource"]!=nil,position=i==2||i==3;DYMaskParameters p=DYMaskAtTime(m,stamp&&!position?kCMTimeInvalid:self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(stamp&&(i==4||i==5)){DYStampMotion motion=DYStampMotionAtTime(m,self->_time);*fields[i]/=i==4?motion.targetScaleX:motion.targetScaleY;}if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&(stamp?position:i<8)){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYStampKey(self->_time,p,YES,1,DYStampMotionAtTime(m,self->_time))];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
- (void)updateDrawingControls{for(NSButton *button in _tracking)button.enabled=!_drawing;_clear.enabled=!_drawing&&[[self mask][@"keys"]count]>0;_penFinish.enabled=_drawing;_penCancel.enabled=_drawing;}
- (NSString*)canvasNodeID{return DYSharedMaskWithID(_document,_maskID)?@"shared":_nodeID;}
- (BOOL)representsCanvasMask:(NSDictionary*)info{NSString *maskID=info[@"mask"];if(!maskID.length)return NO;if([info[@"node"]isEqual:_nodeID])return YES;if(!DYSharedMaskWithID(_document,maskID))return NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID])return YES;return NO;}
@@ -111,7 +111,23 @@
- (void)canvas:(id)sender{[self sendCanvasDrawing:NO];}
- (void)redrawPen:(id)sender{[self sendCanvasDrawing:YES];}
- (void)penCommand:(NSButton*)sender{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"command":sender==_penFinish?@"finish":@"cancel",@"timeValue":@(_time.value),@"timeScale":@(_time.timescale),@"timeEpoch":@(_time.epoch)}];}
- (void)clear:(id)sender{if(_drawing)return;[self edit:@"清除蒙版轨迹" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];m[@"keys"]=@[];[m removeObjectForKey:@"status"];}];}
- (void)clear:(id)sender{
if(_drawing)return;
[self edit:@"清除蒙版轨迹" block:^(NSMutableDictionary *d,NSMutableDictionary *m){
DYMaskParameters p=DYMaskAtTime(m,self->_time);
if(m[@"stampSource"]){
NSArray *source=DYStampSourceAtTime(m,self->_time);
DYStampMotion motion=DYStampMotionAtTime(m,self->_time);
m[@"stampSource"]=@[source[0],source[1],
@(std::clamp([source[2] doubleValue]*motion.sourceScaleX,.001,1.)),
@(std::clamp([source[3] doubleValue]*motion.sourceScaleY,.001,1.))];
m[@"stampSamplingScale"]=DYStampSamplingScaleAtTime(m,self->_time);
}
m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
m[@"keys"]=@[];
[m removeObjectForKey:@"status"];
}];
}
- (void)track:(NSButton*)sender{if(_drawing)return;[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"direction":@(sender.tag)}];}
- (void)trackingStatus:(NSNotification*)n{BOOL target=n.userInfo[@"mask"]?[self representsCanvasMask:n.userInfo]:[n.userInfo[@"node"]isEqual:_nodeID];if(target&&(!n.userInfo[@"mask"]||[n.userInfo[@"mask"]isEqual:_maskID]))_status.stringValue=n.userInfo[@"message"]?:@"";}
@end
+7 -1
查看文件
@@ -8,6 +8,7 @@
#import "DYAutoGrade.h"
#import "DYToolState.h"
#include "DYFilmTime.h"
#include "DYLevelGeometry.h"
#import <CoreImage/CoreImage.h>
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
#import <os/log.h>
@@ -41,7 +42,12 @@
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;}
- (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray<FxImageTile*>*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;}
- (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray<FxImageTile*>*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){@synchronized(self){FxRect image=[src[0]imagePixelBounds];double aspect=[src[0]pixelAspect],height=image.top-image.bottom;_toolSourceAspect=height>0&&std::isfinite(aspect)&&aspect>0?(image.right-image.left)*aspect/height:1;_toolSourceFrame={};_toolSourceTime=t;}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];@synchronized(self){
FxRect image=src[0].imagePixelBounds;
double aspect=src[0].pixelAspect,height=image.top-image.bottom,width=image.right-image.left;
_toolSourceAspect=width>0&&height>0&&std::isfinite(aspect)&&aspect>0?width*aspect/height:0;
if(_toolCaptureEnabled&&!_trackingActive.load()){_toolSourceFrame={};_toolSourceTime=t;}
}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
}
- (void)alert:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{NSAlert*a=[NSAlert new];a.messageText=@"大鱼调色";a.informativeText=message?:@"操作未完成";[a runModal];[a release];});}
- (void)exportRequested:(NSNotification*)n{
+1
查看文件
@@ -22,6 +22,7 @@
#include <cmath>
#include "DYScopeMath.hpp"
#import "DYScopeSample.h"
#include "DYLevelGeometry.h"
static BOOL fail(NSError**e,NSString*m){if(e)*e=[NSError errorWithDomain:@"com.dayu.color" code:1 userInfo:@{NSLocalizedDescriptionKey:m?:@"Metal 调色失败"}];return NO;}
// MRC NSError out-parameters must outlive every nested render pool. Preserve
// the same pointer across nested closures, then autorelease in the caller pool.
+1 -1
查看文件
@@ -11,7 +11,7 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
- (instancetype)init {
if((self=[super init])) {
_defaults=[[NSUserDefaults alloc]initWithSuiteName:preferenceDomain];
[_defaults registerDefaults:@{@"themeIndex":@7}];
[_defaults registerDefaults:@{@"themeIndex":@8}];
[[NSDistributedNotificationCenter defaultCenter]addObserver:self selector:@selector(externalChange:) name:distributedChange object:preferenceDomain suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
}
return self;
@@ -90,7 +90,7 @@
{
DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,&error);
DYWorkspaceDiagnosticHost *base=[[[DYWorkspaceDiagnosticHost alloc]init]autorelease];DYCreateParameters(base,&error);
DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero;
id<DYToolCanvasHostProbe> plugin=(id)[[NSClassFromString(@"DYPlugIn")alloc]initWithAPIManager:host];
[plugin scheduleToolCanvasRegistration];NSData *state=nil;[plugin pluginState:&state atTime:kCMTimeZero quality:(FxQuality)0 error:&error];
@@ -112,12 +112,98 @@
click(180,291.25); // normalized source (0.25, 0.25)
NSInteger part=down(348,244);
[osc mouseDraggedAtPositionX:460 positionY:181 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];
up(460,181,part);drain();
NSDictionary *stamp=[DYSharedMasks(DYReadTools(host,kCMTimeZero).document) firstObject];NSArray *source=stamp[@"stampSource"];
CMTime actionTime=CMTimeMake(39,25);
[osc drawOSCWithWidth:640 height:400 activePart:part destinationImage:overlay atTime:actionTime];
host->_time=actionTime;
up(460,181,part);
[osc drawOSCWithWidth:640 height:400 activePart:part destinationImage:overlay atTime:actionTime];
run.record(@"native-osc-stamp-preview-survives-async-save-and-different-render-time",
[[(id)osc valueForKey:@"stampSaving"]boolValue]&&[[viewer valueForKey:@"stampArmed"]boolValue]&&
[[(id)osc valueForKey:@"stampHasSource"]boolValue]&&!DYSharedMasks(DYReadTools(base,kCMTimeZero).document).count);
drain();
NSDictionary *stamp=[DYSharedMasks(DYReadTools(host,kCMTimeZero).document) firstObject];
NSArray *source=[[stamp[@"stampSource"]copy]autorelease];
DYMaskParameters target=DYMaskAtTime(stamp,kCMTimeZero);
run.record(@"native-osc-creates-one-stamp-and-one-undo-from-source-click-and-drag",source.count==4&&fabs([source[0]doubleValue]-.25)<1e-6&&fabs([source[1]doubleValue]-.25)<1e-6&&fabs(target.centerX-.65)<1e-6&&fabs(target.centerY-.5)<1e-6&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
run.record(@"native-osc-stamp-selects-saved-overlay-when-action-time-differs",
stamp&&[[plugin toolCanvasMaskAtTime:actionTime][@"id"]isEqual:stamp[@"id"]]&&
![[viewer valueForKey:@"stampArmed"]boolValue]&&![[(id)osc valueForKey:@"stampSaving"]boolValue]);
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
click(251,104);drain(); // first draw has top-down viewport y=30...345, forward button is x=212...290.
NSString *stampID=[[stamp[@"id"]copy]autorelease];
NSMutableDictionary *tracked=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);
NSMutableDictionary *trackedStamp=(id)DYSharedMaskWithID(tracked,stampID);
DYMaskParameters moved=target;moved.centerX+=.05f;
NSArray *keys=@[DYMaskKey(kCMTimeZero,target,NO,1),DYMaskKey(CMTimeMake(1,25),moved,NO,1)];
trackedStamp[@"keys"]=keys;DYWriteTools(host,tracked,kCMTimeZero);
[plugin pluginState:&state atTime:kCMTimeZero quality:(FxQuality)0 error:&error];
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
undo=base->_undoStarts;
part=down(180,291.25);
[osc mouseDraggedAtPositionX:236 positionY:259.75 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];
NSArray *preview=[plugin toolCanvasMaskAtTime:kCMTimeZero][@"stampSource"];
up(236,259.75,part);drain();
NSDictionary *edited=DYSharedMaskWithID(DYReadTools(host,kCMTimeZero).document,stampID);
NSArray *relocated=edited[@"stampSource"];
run.record(@"native-osc-drag-moves-only-the-stamp-source-and-keeps-tracking-keys",part==7&&fabs([relocated[0]doubleValue]-.35)<1e-6&&fabs([relocated[1]doubleValue]-.35)<1e-6&&[relocated isEqual:preview]&&[edited[@"parameters"]isEqual:trackedStamp[@"parameters"]]&&[edited[@"keys"]isEqual:keys]&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1,@{@"part":@(part),@"source":relocated?:@[],@"keys":@([edited[@"keys"]count]),@"undoGroups":@(base->_undoStarts-undo)});
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
part=down(236,259.75);
[osc mouseDraggedAtPositionX:270 positionY:240 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];
BOOL handled=NO;
[osc keyDownAtPositionX:270 positionY:240 keyPressed:27 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];
drain();
run.record(@"native-osc-escape-cancels-the-stamp-source-drag-without-another-undo",handled&&[DYSharedMaskWithID(DYReadTools(host,kCMTimeZero).document,stampID)[@"stampSource"]isEqual:relocated]&&base->_undoStarts==undo+1);
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
BOOL rotationHandle=NO;
for(NSDictionary *handle in [(id)osc valueForKey:@"handles"])rotationHandle|=[handle[@"part"]integerValue]==6;
part=down(348,244);
[osc mouseDraggedAtPositionX:320 positionY:260 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];
up(320,260,part);drain();
NSDictionary *resized=DYSharedMaskWithID(DYReadTools(host,kCMTimeZero).document,stampID);
DYMaskParameters enlarged=DYMaskAtTime(resized,kCMTimeZero);
run.record(@"native-osc-stamp-resizes-coverage-without-rotation-handle-or-track-changes",!rotationHandle&&part==2&&enlarged.width>target.width&&enlarged.height>target.height&&enlarged.centerX==target.centerX&&enlarged.centerY==target.centerY&&[resized[@"keys"]isEqual:keys]);
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
undo=base->_undoStarts;
part=down(404,212.5);
[osc mouseDraggedAtPositionX:460 positionY:196.75 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];
up(460,196.75,part);drain();
NSDictionary *repositioned=DYSharedMaskWithID(DYReadTools(host,kCMTimeZero).document,stampID);
NSArray *editedKeys=repositioned[@"keys"];
DYMaskParameters trackedCenter=DYMaskAtTime(repositioned,kCMTimeZero);
run.record(@"native-osc-stamp-target-move-saves-the-canvas-key-with-a-different-action-time",
part==1&&fabs(trackedCenter.centerX-.75)<1e-6&&fabs(trackedCenter.centerY-.55)<1e-6&&
editedKeys.count==2&&[editedKeys[0][@"manual"]boolValue]&&[editedKeys[1]isEqual:keys[1]]&&
base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
host->_time=kCMTimeZero;
click(251,104);drain(); // top-down viewport y=30...345, forward button is x=212...290.
run.record(@"native-osc-stamp-forward-action-starts-the-existing-host-tracker",host->_forwardStarts==1&&host->_backwardStarts==0);
[plugin cleanupAnalysis:nil];drain();[(id)osc release];[(id)plugin release];
[plugin cleanupAnalysis:nil];drain();
NSDictionary *beforeRejected=[[DYReadTools(base,kCMTimeZero).document copy]autorelease];
base->_rejectToolsWrites=YES;
click(NSMidX(button),400-NSMidY(button));
click(180,291.25);
part=down(348,244);up(460,181,part);drain();
run.record(@"native-osc-stamp-rejected-write-keeps-the-draft-and-existing-document",
[beforeRejected isEqual:DYReadTools(base,kCMTimeZero).document]&&
[[viewer valueForKey:@"stampArmed"]boolValue]&&[[(id)osc valueForKey:@"stampHasSource"]boolValue]&&
[(id)osc valueForKey:@"stampFailure"]!=nil);
base->_rejectToolsWrites=NO;
part=down(348,244);up(460,181,part);drain();
NSArray *afterRetry=DYSharedMasks(DYReadTools(base,kCMTimeZero).document);
run.record(@"native-osc-stamp-retries-with-the-same-source-and-saves-once",
afterRetry.count==DYSharedMasks(beforeRejected).count+1&&
[afterRetry.lastObject[@"stampSource"]isEqual:source]&&![[viewer valueForKey:@"stampArmed"]boolValue]);
NSString *untrackedID=[[afterRetry.lastObject[@"id"]copy]autorelease];
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
host->_time=actionTime;
undo=base->_undoStarts;
part=down(404,212.5);
[osc mouseDraggedAtPositionX:460 positionY:196.75 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];
up(460,196.75,part);drain();
NSDictionary *untracked=DYSharedMaskWithID(DYReadTools(host,kCMTimeZero).document,untrackedID);
DYMaskParameters untrackedCenter=DYMaskAtTime(untracked,kCMTimeZero);
run.record(@"native-osc-untracked-stamp-target-saves-in-place-with-a-different-action-time",
part==1&&fabs(untrackedCenter.centerX-.75)<1e-6&&fabs(untrackedCenter.centerY-.55)<1e-6&&
![untracked[@"keys"]count]&&[untracked[@"stampSource"]isEqual:source]&&
base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
[(id)osc release];[(id)plugin release];
}
+35 -9
查看文件
@@ -8,8 +8,8 @@
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
}
- (void)commitToolCanvasDraftAtTime:(CMTime)eventTime {
NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;
@synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime;
NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;BOOL stampEdit,sourceEdit,resizeStamp;
@synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime;stampEdit=draft[@"stampSource"]!=nil;sourceEdit=_toolDragPart==DYCloneSourcePart;resizeStamp=stampEdit&&_toolDragPart>=2&&_toolDragPart<=5;
// Keep the completed path visible until the authoritative write returns.
// Discarding it here exposed the new pen mask's default rectangular nodes
// during the OSC redraw that immediately follows the closing click.
@@ -18,16 +18,26 @@
@synchronized(self){if(self->_trackingActive.load()||revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;}
id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO;
[a startAction:self];@try{
os_log(OS_LOG_DEFAULT,"dayu_pen_commit event=%{public}.9f action=%{public}.9f nodes=%{public}lu",CMTimeGetSeconds(time),CMTimeGetSeconds(a.currentTime),(unsigned long)([draft[@"nodes"]length]/sizeof(DYBezierNode)));
if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(DYHostDisplayedFrameTime(self->_apiManager,a.currentTime),time)!=0){[self postToolCanvasStatus:@"播放头已移动,本次蒙版草稿未写入其它帧。"];return;}
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,time).document),*current=[self toolMask:maskID node:node document:doc];
CMTime actionTime=DYHostDisplayedFrameTime(self->_apiManager,a.currentTime);
os_log(OS_LOG_DEFAULT,"dayu_pen_commit stamp=%{public}d event=%{public}.9f action=%{public}.9f nodes=%{public}lu",stampEdit,CMTimeGetSeconds(time),CMTimeGetSeconds(actionTime),(unsigned long)([draft[@"nodes"]length]/sizeof(DYBezierNode)));
if(!CMTIME_IS_NUMERIC(actionTime)||(!stampEdit&&CMTimeCompare(actionTime,time)!=0)){[self postToolCanvasStatus:@"播放头已移动,本次蒙版草稿未写入其它帧。"];return;}
// The stamp document is non-animatable. Preserve the canvas time for the
// geometry and tracking key, and access the document at the host action time.
CMTime writeTime=stampEdit?actionTime:time;
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,writeTime).document),*current=[self toolMask:maskID node:node document:doc];
if(!current||![current isEqual:original]){os_log(OS_LOG_DEFAULT,"dayu_pen_commit conflict current=%{public}d",current!=nil);[self postToolCanvasStatus:@"蒙版已在其它位置修改,本次画面草稿未覆盖它。"];return;}
NSMutableDictionary *result=DYMutablePlist(draft);
if([current[@"keys"]count]){DYMaskParameters p=DYMaskAtTime(result,time);NSMutableArray *keys=[[current[@"keys"]mutableCopy]autorelease];NSIndexSet *same=[keys indexesOfObjectsPassingTest:^BOOL(NSDictionary *key,NSUInteger i,BOOL *stop){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)==0;}];[keys removeObjectsAtIndexes:same];[keys addObject:DYMaskKey(time,p,YES,1)];result[@"keys"]=@[];if(!DYMergeTracking(result,keys))return;}
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,time);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}}
NSMutableDictionary *result=sourceEdit?[[draft mutableCopy]autorelease]:DYMutablePlist(draft);
if(resizeStamp){
DYMaskParameters p=DYMaskAtTime(result,kCMTimeInvalid),authored=DYMaskAtTime(current,kCMTimeInvalid);
DYStampMotion motion=DYStampMotionAtTime(current,time);
authored.width=p.width/motion.targetScaleX;authored.height=p.height/motion.targetScaleY;
result[@"parameters"]=[NSData dataWithBytes:&authored length:sizeof(authored)];
result[@"keys"]=current[@"keys"];
}else if(!sourceEdit&&[current[@"keys"]count]){DYMaskParameters p=DYMaskAtTime(result,time);if(current[@"stampSource"])result[@"parameters"]=current[@"parameters"];NSMutableArray *keys=[[current[@"keys"]mutableCopy]autorelease];NSIndexSet *same=[keys indexesOfObjectsPassingTest:^BOOL(NSDictionary *key,NSUInteger i,BOOL *stop){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)==0;}];[keys removeObjectsAtIndexes:same];[keys addObject:DYStampKey(time,p,YES,1,DYStampMotionAtTime(current,time))];result[@"keys"]=@[];if(!DYMergeTracking(result,keys))return;}
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else if(stampEdit)[self postToolCanvasStatus:@"宿主未保存图章修改,已保留上一次位置。"];}
}@finally{[a endAction:self];}
os_log(OS_LOG_DEFAULT,"dayu_pen_commit result=%{public}d valid=%{public}d",changed,DYValidToolMask(draft));
if(changed)[self postToolCanvasStatus:@"蒙版已保存 · 可一次撤销"];
if(changed)[self postToolCanvasStatus:sourceEdit?@"图章取样点已移动 · 可一次撤销":stampEdit?@"图章已保存 · 可一次撤销":@"蒙版已保存 · 可一次撤销"];
[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
}@finally{@synchronized(self){if(revision==self->_toolCanvasRevision){[self->_toolCanvasDraft release];self->_toolCanvasDraft=nil;[self->_toolCanvasOriginal release];self->_toolCanvasOriginal=nil;self->_toolCanvasEditTime=kCMTimeInvalid;}self->_toolCanvasCommitPending=NO;}[self postToolCanvasStatus:nil];}});[draft release];[original release];[node release];[maskID release];
}
@@ -74,6 +84,14 @@
if(type==NSEventTypeLeftMouseDown){
_toolCanvasHasHover=NO;
if(_toolDrawingPen&&part==1000&&[_toolCanvasDraft[@"nodes"]length]>=3*sizeof(DYBezierNode)){[self commitToolCanvasDraftAtTime:time];return;}
if(part==DYCloneSourcePart){
NSDictionary *stamp=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];
if([stamp[@"stampSource"]count]!=4)return;
[self discardToolCanvasDraft];
_toolCanvasOriginal=[stamp mutableCopy];_toolCanvasDraft=[stamp mutableCopy];_toolCanvasEditTime=time;
_toolDragStart=point;_toolDragPart=part;
return;
}
if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceAspect>0?_toolSourceAspect:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];}
if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}
_toolDragStart=point;_toolDragPart=part;_toolDragParameters=DYMaskAtTime(_toolCanvasDraft,time);
@@ -83,6 +101,14 @@
if(!_toolCanvasDraft)return;
if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];return;}
if(_toolDrawingShape&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp)){[self updateToolShapeDraftAtPoint:point];if(type==NSEventTypeLeftMouseUp){DYMaskParameters p=DYMaskAtTime(_toolCanvasDraft,time);if(p.width<=.001f||p.height<=.001f){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"未拖出有效区域,原蒙版已保留。"];return;}[self commitToolCanvasDraftAtTime:time];}return;}
if(_toolDragPart==DYCloneSourcePart&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp)){
NSArray *source=_toolCanvasOriginal[@"stampSource"];
double x=fmax(0,fmin(1,[source[0]doubleValue]+(point.x-_toolDragStart.x)));
double y=fmax(0,fmin(1,[source[1]doubleValue]+(point.y-_toolDragStart.y)));
_toolCanvasDraft[@"stampSource"]=@[@(x),@(y),source[2],source[3]];
if(type==NSEventTypeLeftMouseUp)[self commitToolCanvasDraftAtTime:time];
return;
}
if(type==NSEventTypeLeftMouseDragged){_toolCanvasHasHover=NO;DYMaskParameters p=_toolDragParameters;float dx=point.x-_toolDragStart.x,dy=point.y-_toolDragStart.y;
if(_toolDrawingPen||_toolDragPart>=1000){NSMutableData *data=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];NSUInteger count=data.length/sizeof(DYBezierNode);if(count){auto *nodes=(DYBezierNode*)data.mutableBytes;NSUInteger index=_toolDrawingPen?count-1:(_toolDragPart-1000)/3,handle=_toolDrawingPen?2:(_toolDragPart-1000)%3;float a=p.imageAspect,c=cos(p.angle),s=sin(p.angle),x=((point.x-p.centerX)*a*c+(point.y-p.centerY)*s)/(p.width*a),y=(-(point.x-p.centerX)*a*s+(point.y-p.centerY)*c)/p.height;if(index<count){if(handle==0){float mx=x-nodes[index].x,my=y-nodes[index].y;nodes[index].x=x;nodes[index].y=y;nodes[index].inX+=mx;nodes[index].inY+=my;nodes[index].outX+=mx;nodes[index].outY+=my;}else if(handle==1){nodes[index].inX=x;nodes[index].inY=y;}else{nodes[index].outX=x;nodes[index].outY=y;if(_toolDrawingPen){nodes[index].inX=2*nodes[index].x-x;nodes[index].inY=2*nodes[index].y-y;}}_toolCanvasDraft[@"nodes"]=data;}}}
else if(_toolDragPart==6)p.angle=atan2((point.y-p.centerY),(point.x-p.centerX)*p.imageAspect)+M_PI/2;
+4 -4
查看文件
@@ -4,9 +4,9 @@ struct DYToolMaskEntry {DYResolvedMask mask;int section,combine;};
struct DYToolMaskHeader {unsigned count;float offsetX,offsetY,scaleX,scaleY;int section,premultiplied,faceOnly,skinPreview;};
struct DYToolStageRange {int first,last,suppressBlackWhite;};
// Map normalized destination coordinates to the original source ellipse.
// Destination coverage and the source sampling transform are independent.
struct DYCloneStamp {
float centerX,centerY,sourceX,sourceY,sourceWidth,sourceHeight;
float localXX,localXY,localYX,localYY;
float feather,strength,inputBlack,inputWhite,inputGamma;
float centerX,centerY,sourceX,sourceY,samplingScaleX,samplingScaleY;
float inverseRadiusX,inverseRadiusY,feather,strength,inputBlack,inputWhite,inputGamma;
unsigned subpixel;
};
+37 -2
查看文件
@@ -2,13 +2,22 @@
// 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];
}
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile preview:(NSDictionary**)preview error:(NSError**)error {
@synchronized(_toolCaptureDevices){
FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;
if(bounds.left!=image.left||bounds.right!=image.right||bounds.bottom!=image.bottom||bounds.top!=image.top)return {};
NSNumber *key=@(tile.deviceRegistryID);NSMutableDictionary *entry=_toolCaptureDevices[key];
if(!entry){NSArray *devices=MTLCopyAllDevices();id<MTLDevice>device=nil;for(id<MTLDevice>candidate in devices)if(candidate.registryID==tile.deviceRegistryID)device=candidate;
if(device){id<MTLLibrary>library=[device newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];id<MTLFunction>gray=[library newFunctionWithName:@"dyToolCapture"],gamma=[library newFunctionWithName:@"dyToolEncodeGamma22"];id<MTLComputePipelineState>grayPipeline=gray?[device newComputePipelineStateWithFunction:gray error:error]:nil,gammaPipeline=gamma?[device newComputePipelineStateWithFunction:gamma error:error]:nil;id<MTLCommandQueue>queue=[device newCommandQueue];MPSImageLanczosScale *scale=[[MPSImageLanczosScale alloc]initWithDevice:device];
if(grayPipeline&&gammaPipeline&&queue&&scale){entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":device,@"gray":grayPipeline,@"gamma":gammaPipeline,@"queue":queue,@"scale":scale}];_toolCaptureDevices[key]=entry;}
if(grayPipeline&&gammaPipeline&&queue&&scale){
entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":device,@"gray":grayPipeline,@"gamma":gammaPipeline,@"queue":queue,@"scale":scale}];_toolCaptureDevices[key]=entry;
id<MTLFunction>function=[library newFunctionWithName:@"dyToolTrackingPreview"];
id<MTLComputePipelineState>pipeline=function?[device newComputePipelineStateWithFunction:function error:nil]:nil;
entry[@"previewPipeline"]=pipeline;
[pipeline release];[function release];
}
[scale release];[queue release];[grayPipeline release];[gammaPipeline release];[gray release];[gamma release];[library release];
}[devices release];if(!entry)return {};
}
@@ -21,8 +30,34 @@
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<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];[commands commit];[commands waitUntilCompleted];
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];
id<MTLBuffer>previewBuffer=nil;
vector_uint3 previewInfo={0,0,info.z};
if(preview&&entry[@"previewPipeline"]){
double scale=std::min({1.,640./width,360./height});
previewInfo.x=std::max(1u,(unsigned)(width*scale));previewInfo.y=std::max(1u,(unsigned)(height*scale));
NSUInteger size=previewInfo.x*previewInfo.y*4;
previewBuffer=entry[@"previewBuffer"];
if(previewBuffer.length!=size){
previewBuffer=[[device newBufferWithLength:size options:MTLResourceStorageModeShared]autorelease];
entry[@"previewBuffer"]=previewBuffer;
}
if(previewBuffer){
encoder=[commands computeCommandEncoder];
[encoder setComputePipelineState:entry[@"previewPipeline"]];[encoder setTexture:bytes atIndex:0];
[encoder setBuffer:previewBuffer offset:0 atIndex:0];[encoder setBytes:&previewInfo length:sizeof(previewInfo) atIndex:1];
[encoder dispatchThreads:MTLSizeMake(previewInfo.x,previewInfo.y,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];
[encoder endEncoding];
}
}
[commands commit];[commands waitUntilCompleted];
if(commands.status!=MTLCommandBufferStatusCompleted){if(error)*error=commands.error;return {};}
if(previewBuffer){
double pixelAspect=tile.pixelAspect;
double aspect=double(width)/height*(std::isfinite(pixelAspect)&&pixelAspect>0?pixelAspect:1);
*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;
}
}
@@ -1,3 +1,4 @@
static const NSInteger DYCloneSourcePart=7;
@class DYPlugIn;
static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static dispatch_once_t once;dispatch_once(&once,^{map=[[NSMapTable strongToWeakObjectsMapTable]retain];});return map;}
@interface DYPlugIn (ToolCanvas)
@@ -5,6 +6,8 @@ static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static disp
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time;
- (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time;
- (BOOL)toolCanvasVisible;
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time;
- (DYLevelTransform)toolCanvasLevelForAspect:(double)fallback rotation:(double *)rotation;
- (void)saveCanvasLevel:(double)rotation replacing:(double)previous completion:(void (^)(NSString *failure))completion;
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion;
- (void)trackCloneStamp:(NSString*)stampID direction:(NSInteger)direction;
@end
+7 -1
查看文件
@@ -15,6 +15,12 @@
NSString *_trackingNode,*_trackingMaskID,*_trackingMessage;
NSDictionary *_trackingFrozenMask;NSMutableDictionary *_trackingCandidate;
NSMutableArray *_trackingSamples;
CMTimeRange _trackingPreviewInputRange;
NSUInteger _trackingPreviewTotal,_trackingPreviewCompleted;
NSDictionary *_trackingPreviewFrame;
BOOL _trackingPreviewQueued;
DYMaskParameters _trackingSeed;
dy::OpenCVTracker _toolTracker;
DYStampMotion _trackingStampMotion;
dy::TrackerROI _trackingStampSourceSeed;
dy::OpenCVTracker _toolTracker,_stampSourceTracker;
NSMutableDictionary *_toolCaptureDevices;
+225 -29
查看文件
@@ -6,7 +6,7 @@
- (void)tearDownToolHost {
[_viewerParameterBridge invalidate];[_viewerParameterBridge release];_viewerParameterBridge=nil;
[_toolAnalysisTimer invalidate];[_toolAnalysisTimer release];@synchronized(DYToolCanvasSessions()){if(_toolSession)[DYToolCanvasSessions()removeObjectForKey:_toolSession];}
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_toolCaptureDevices release];
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_trackingPreviewFrame release];[_toolCaptureDevices release];
}
- (void)adoptToolCanvasDocument:(NSDictionary*)document {
if(!document)return;@synchronized(self){[_toolCanvasDocument release];_toolCanvasDocument=[document copy];if([self toolMask:_selectedToolMask node:_selectedToolNode document:document])return;NSString *node=nil,*maskID=nil;for(NSString *type in DYToolTypes())for(NSDictionary *mask in DYMasksForTool(document,[@"base:" stringByAppendingString:type]))if(!node&&[mask[@"enabled"]boolValue]){node=[@"base:" stringByAppendingString:type];maskID=mask[@"id"];}for(NSDictionary *layer in document[@"layers"])for(NSDictionary *mask in DYMasksForTool(document,layer[@"id"]))if(!node&&[mask[@"enabled"]boolValue]){node=layer[@"id"];maskID=mask[@"id"];}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[maskID copy];}
@@ -19,36 +19,83 @@
- (void)toolStatus:(NSString*)message {
NSString *node=[[_trackingNode?:_selectedToolNode copy]autorelease],*mask=[[_trackingMaskID?:_selectedToolMask copy]autorelease];dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":mask?:@"",@"message":message?:@""}];});
}
- (void)postTrackingPreview:(NSDictionary*)frame active:(BOOL)active message:(NSString*)message {
NSMutableDictionary *info=[NSMutableDictionary dictionaryWithDictionary:frame?:@{}];
info[@"node"]=_trackingNode?:@"";info[@"mask"]=_trackingMaskID?:@"";
info[@"tracking"]=@(active);info[@"message"]=message;
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:_apiManager userInfo:info];
}
- (void)publishTrackingPreview {
NSDictionary *frame=nil;
@synchronized(self){
frame=[_trackingPreviewFrame autorelease];_trackingPreviewFrame=nil;_trackingPreviewQueued=NO;
}
if(!frame||!_trackingActive.load())return;
NSUInteger done=[frame[@"completed"]unsignedIntegerValue],total=[frame[@"total"]unsignedIntegerValue];
NSString *direction=[frame[@"backward"]boolValue]?@"反向":@"正向";
NSString *message=total?[NSString stringWithFormat:@"%@ · %lu / %lu 帧 · %.0f%%",direction,(unsigned long)done,(unsigned long)total,100.*done/total]
:[NSString stringWithFormat:@"%@ · 已分析 %lu 帧",direction,(unsigned long)done];
[self postTrackingPreview:frame active:YES message:message];
}
- (void)queueTrackingPreview:(NSDictionary*)frame {
uint64_t generation=_trackingGeneration;
@synchronized(self){
[_trackingPreviewFrame release];_trackingPreviewFrame=[frame copy];
if(_trackingPreviewQueued)return;
_trackingPreviewQueued=YES;
}
// Keep one coherent packet pending. A slow UI may skip intermediate updates
// without ever pairing geometry from one frame with pixels from another.
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC/30),dispatch_get_main_queue(),^{
if(self->_trackingGeneration==generation)[self publishTrackingPreview];
});
}
- (void)toolCanvasSelection:(NSNotification*)notification {
NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;NSDictionary *document=notification.userInfo[@"document"];if(document&&DYValidToolDocument(document)){DYToolDocument *immutable=[[[DYToolDocument alloc]init]autorelease];immutable.document=document;[self adoptToolCanvasDocument:immutable.document];}os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_selected");
@synchronized(self){if(DYSharedMaskWithID(_toolCanvasDocument,mask))node=@"shared";if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];NSDictionary *shape=[self toolMask:mask node:node document:_toolCanvasDocument];DYMaskParameters shapeParameters=DYMaskAtTime(shape,kCMTimeInvalid);_toolDrawingShape=shape&&shapeParameters.kind<2&&[notification.userInfo[@"drawShape"]boolValue];if(_toolDrawingShape)_toolDrawingPen=NO;++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":_toolDrawingShape?@"在画面按下并拖出蒙版区域;Esc 取消。":@"已选中本层蒙版"];
}
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time {
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion {
dispatch_async(dispatch_get_main_queue(),^{
if(self->_trackingActive.load()||!CMTIME_IS_NUMERIC(time))return;
if(self->_trackingActive.load()){completion(@"请先停止跟踪,再绘制图章。");return;}
id<FxCustomParameterActionAPI_v4>action=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
if(!action)return;
if(!action){completion(@"宿主暂时无法保存图章,请重试。");return;}
NSDictionary *selection=nil;
NSString *failure=nil;
[action startAction:self];@try{
if(CMTimeCompare(DYHostDisplayedFrameTime(self->_apiManager,action.currentTime),time)!=0)return;
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,time).document);
NSMutableDictionary *stamp=(id)DYAddSharedMask(doc,DYMaskEllipse);
if(!stamp){NSBeep();return;}
DYMaskParameters p=DYMaskAtTime(stamp,kCMTimeInvalid);
p.centerX=NSMidX(target);p.centerY=NSMidY(target);p.width=target.size.width;p.height=target.size.height;
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
stamp[@"stampSource"]=@[@(source.x),@(source.y),@(p.width),@(p.height)];
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
BOOL grouped=[undo startUndoGroup:@"创建仿制图章"];
if(DYWriteTools(self->_apiManager,doc,time))selection=@{@"node":@"shared",@"mask":stamp[@"id"],@"document":doc};
else NSBeep();
if(grouped)[undo endUndoGroup];
// A new stamp is clip-wide. The OSC supplies geometry, while the action
// supplies the time for accessing this instance's non-animatable document.
CMTime writeTime=DYHostDisplayedFrameTime(self->_apiManager,action.currentTime);
id<FxParameterRetrievalAPI_v6>get=[self->_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
DYToolDocument *stored=nil;
if(!CMTIME_IS_NUMERIC(writeTime)||![get getCustomParameterValue:&stored fromParameter:DYToolsParameterID atTime:writeTime]||![stored isKindOfClass:DYToolDocument.class]){
failure=@"宿主暂时无法读取当前图章,请重试。";
}else{
NSMutableDictionary *doc=DYMutablePlist(stored.document);
NSMutableDictionary *stamp=(id)DYAddSharedMask(doc,DYMaskEllipse);
if(!stamp){
failure=DYSharedMasks(doc).count>=DYSharedMaskLimit?@"已达到蒙版与图章数量上限。":@"无法在当前效果中创建图章。";
}else{
DYMaskParameters p=DYMaskAtTime(stamp,kCMTimeInvalid);
p.centerX=NSMidX(target);p.centerY=NSMidY(target);p.width=target.size.width;p.height=target.size.height;
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
stamp[@"stampSource"]=@[@(source.x),@(source.y),@(p.width),@(p.height)];
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
BOOL grouped=[undo startUndoGroup:@"创建仿制图章"];
@try{
if(DYWriteTools(self->_apiManager,doc,writeTime))selection=@{@"node":@"shared",@"mask":stamp[@"id"],@"document":doc};
else failure=@"宿主未保存图章,请重新拖出覆盖区。";
}@finally{if(grouped)[undo endUndoGroup];}
}
}
os_log(OS_LOG_DEFAULT,"dayu_clone_commit accepted=%{public}d osc=%{public}.9f action=%{public}.9f",
selection!=nil,CMTimeGetSeconds(time),CMTimeGetSeconds(writeTime));
}@finally{[action endAction:self];}
if(selection){
[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:self->_apiManager userInfo:selection];
[self postToolCanvasStatus:@"仿制图章已保存 · 可跟踪目标区域"];
}
[self postToolCanvasStatus:@"仿制图章已保存 · 可跟踪取样与覆盖区域"];
}else [self postToolCanvasStatus:failure];
completion(failure);
});
}
- (void)trackCloneStamp:(NSString*)stampID direction:(NSInteger)direction{
@@ -57,10 +104,48 @@
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:self->_apiManager userInfo:@{@"node":@"shared",@"mask":stampID,@"direction":@(direction)}];
});
}
- (DYLevelTransform)toolCanvasLevelForAspect:(double)fallback rotation:(double *)rotation {
@synchronized(self){
double angle=[_toolCanvasDocument[@"levelRotation"] doubleValue];
if(rotation)*rotation=angle;
return DYLevelTransform(angle,_toolSourceAspect>0?_toolSourceAspect:fallback);
}
}
- (void)saveCanvasLevel:(double)rotation replacing:(double)previous completion:(void (^)(NSString *failure))completion {
dispatch_async(dispatch_get_main_queue(),^{
NSString *failure=nil;
id<FxCustomParameterActionAPI_v4> action=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
if(!action){completion(@"宿主暂时无法保存水平校正。");return;}
[action startAction:self];
@try {
// The correction is clip-wide. Use the action clock for the document write.
CMTime time=DYHostDisplayedFrameTime(self->_apiManager,action.currentTime);
DYToolDocument *stored=nil;
id<FxParameterRetrievalAPI_v6> get=[self->_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
if(!CMTIME_IS_NUMERIC(time)||![get getCustomParameterValue:&stored fromParameter:DYToolsParameterID atTime:time]||
![stored isKindOfClass:DYToolDocument.class]||[stored.document[@"levelRotation"] doubleValue]!=previous){
failure=@"水平校正状态已变化,请重新画线。";
}else if(rotation!=previous){
NSMutableDictionary *doc=DYMutablePlist(stored.document);
doc[@"levelRotation"]=rotation?@(rotation):nil;
id<FxUndoAPI> undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
BOOL grouped=[undo startUndoGroup:rotation?@"水平校正":@"重置水平校正"];
@try {
if(DYWriteTools(self->_apiManager,doc,time)){
DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;
[self adoptToolCanvasDocument:saved.document];
}else failure=@"宿主未保存水平校正,请重试。";
}@finally{if(grouped)[undo endUndoGroup];}
}
}@finally{[action endAction:self];}
if(!failure)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
completion(failure);
});
}
- (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}}
- (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;}
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time {
@synchronized(self){if(_toolDrawingShape&&_toolCanvasDraft&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_toolCanvasEditTime)!=0)){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,已取消本次框选。"];}if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(time)&&CMTIME_IS_NUMERIC(_toolCanvasEditTime)&&CMTimeCompare(time,_toolCanvasEditTime)==0;NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":m[@"stampSource"]?:@[],@"tracking":@(_trackingActive.load())};}
@synchronized(self){if(_toolDrawingShape&&_toolCanvasDraft&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_toolCanvasEditTime)!=0)){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,已取消本次框选。"];}if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(time)&&CMTIME_IS_NUMERIC(_toolCanvasEditTime)&&CMTimeCompare(time,_toolCanvasEditTime)==0;NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())};}
}
- (void)toolTrackRequested:(NSNotification*)notification {
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
@@ -73,10 +158,29 @@
@synchronized(self){_trackingReferenceFrame={};if(_toolSourceFrame.valid()&&CMTIME_IS_NUMERIC(_toolSourceTime)&&CMTimeCompare(_toolSourceTime,time)==0)_trackingReferenceFrame=_toolSourceFrame;}
id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];NSUInteger numerator=[timing timelineFpsNumeratorForEffect:self],denominator=[timing timelineFpsDenominatorForEffect:self];_trackingFrameDuration=numerator&&denominator&&numerator<=INT32_MAX?CMTimeMake(denominator,(int32_t)numerator):kCMTimeInvalid;if(!CMTIME_IS_NUMERIC(_trackingFrameDuration)||_trackingFrameDuration.value<=0){[self toolStatus:@"宿主未提供精确帧长,跟踪未启动"];return;}
[_trackingNode release];_trackingNode=[node copy];[_trackingMaskID release];_trackingMaskID=[notification.userInfo[@"mask"]copy];[_trackingFrozenMask release];_trackingFrozenMask=[mask copy];[_trackingCandidate release];_trackingCandidate=[DYMutablePlist(mask)retain];[_trackingSamples release];_trackingSamples=[NSMutableArray new];[_trackingMessage release];_trackingMessage=nil;
NSArray *source=DYStampSourceAtTime(mask,time);
_trackingStampMotion=DYStampMotionAtTime(mask,time);
if(source){
_trackingStampMotion.active=true;
_trackingStampSourceSeed={[source[0] floatValue],[source[1] floatValue],
std::min(8.f,[source[2] floatValue]*_trackingStampMotion.sourceScaleX),
std::min(8.f,[source[3] floatValue]*_trackingStampMotion.sourceScaleY),0};
}
_trackingReferenceTime=time;_trackingSeed=seed;_trackingBackward=direction<0;_trackingBoth=direction==0;_trackingSingle=std::abs((int)direction)==2;_trackingDiscard=NO;_trackingCancelled.store(false);_trackingFinishing.store(false);_trackingActive.store(true);++_trackingGeneration;_trackingStarted=NSProcessInfo.processInfo.systemUptime;
_trackingPreviewInputRange=kCMTimeRangeInvalid;_trackingPreviewTotal=_trackingPreviewCompleted=0;
@synchronized(self){[_trackingPreviewFrame release];_trackingPreviewFrame=nil;_trackingPreviewQueued=NO;}
os_log(OS_LOG_DEFAULT,"dayu_tool_track_start direction=%{public}ld reference=%{public}.6f cached=%{public}d",(long)direction,CMTimeGetSeconds(time),_trackingReferenceFrame.valid());
NSError *error=nil;BOOL started=_trackingBackward?[analysis startBackwardAnalysis:kFxAnalysisLocation_GPU error:&error]:[analysis startForwardAnalysis:kFxAnalysisLocation_GPU error:&error];if(!started){_trackingActive.store(false);[self toolStatus:error.localizedDescription?:@"宿主未启动逐帧分析"];return;}
[self toolStatus:@"正在读取宿主源帧并跟踪…"];if(!_toolAnalysisTimer)_toolAnalysisTimer=[[NSTimer scheduledTimerWithTimeInterval:.3 target:self selector:@selector(pollToolAnalysis:) userInfo:nil repeats:YES]retain];
if(_trackingSingle)[self toolStatus:@"正在读取下一张源帧…"];
else{
uint64_t generation=_trackingGeneration;
dispatch_async(dispatch_get_main_queue(),^{
if(self->_trackingGeneration!=generation||!self->_trackingActive.load())return;
[NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceRequested" object:self->_apiManager userInfo:@{@"page":@"tracking"}];
[self postTrackingPreview:nil active:YES message:@"正在读取宿主源帧…"];
});
}
if(!_toolAnalysisTimer)_toolAnalysisTimer=[[NSTimer scheduledTimerWithTimeInterval:.3 target:self selector:@selector(pollToolAnalysis:) userInfo:nil repeats:YES]retain];
}@finally{[a endAction:self];}
}
- (void)pollToolAnalysis:(NSTimer*)timer {
@@ -92,34 +196,126 @@
}
- (BOOL)desiredAnalysisTimeRange:(CMTimeRange*)out forInputWithTimeRange:(CMTimeRange)input error:(NSError**)error {
CMTime end=CMTimeRangeGetEnd(input),ref=_trackingReferenceTime,step=_trackingFrameDuration;if(!CMTIME_IS_NUMERIC(input.start)||!CMTIME_IS_NUMERIC(end)||!CMTIME_IS_NUMERIC(ref)||ref.epoch!=input.start.epoch||ref.epoch!=end.epoch||CMTimeCompare(ref,input.start)<0||CMTimeCompare(ref,end)>=0||!CMTIME_IS_NUMERIC(step)||step.value<=0)return [self stopToolAnalysis:@"跟踪起点或帧长无效" error:error];
_trackingPreviewInputRange=input;
CMTime lo=_trackingBackward?input.start:ref,hi=_trackingBackward?CMTimeAdd(ref,step):end;if(_trackingSingle){if(_trackingBackward){lo=CMTimeSubtract(ref,step);if(CMTimeCompare(lo,input.start)<0)lo=input.start;}else hi=CMTimeAdd(ref,CMTimeMultiply(step,2));}if(CMTimeCompare(hi,end)>0)hi=end;if(_trackingBackward&&CMTimeCompare(ref,input.start)==0&&!_trackingBoth){[_trackingMessage release];_trackingMessage=[@"已到片段边界,未产生新轨迹" copy];}*out=CMTimeRangeFromTimeToTime(lo,hi);return out->duration.value>0;
}
- (BOOL)setupAnalysisForTimeRange:(CMTimeRange)range frameDuration:(CMTime)duration error:(NSError**)error {
if(!CMTIME_IS_NUMERIC(duration)||duration.value<=0||duration.epoch!=0)return [self stopToolAnalysis:@"宿主分析帧长无效" error:error];_trackingFrameDuration=duration;_trackingPreviousTime=kCMTimeInvalid;_trackingFlip=NO;[_trackingSamples removeAllObjects];
std::vector<dy::FlowPoint>polygon;NSData *nodes=_trackingCandidate[@"nodes"];if(_trackingSeed.kind==DYMaskBezier){auto path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));for(int i=0;i<path.count;i++)polygon.push_back({path.x[i],path.y[i]});}else if(_trackingSeed.kind==DYMaskRectangle)polygon={{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}};else for(int i=0;i<128;i++){float angle=i*(2.f*M_PI/128);polygon.push_back({.5f*std::cos(angle),.5f*std::sin(angle)});}_toolTracker.setMask(std::move(polygon));return YES;
if(!_trackingSingle&&CMTIMERANGE_IS_VALID(_trackingPreviewInputRange)){
double step=CMTimeGetSeconds(duration);
double forward=CMTimeGetSeconds(CMTimeSubtract(CMTimeRangeGetEnd(_trackingPreviewInputRange),_trackingReferenceTime))/step;
double backward=CMTimeGetSeconds(CMTimeSubtract(_trackingReferenceTime,_trackingPreviewInputRange.start))/step;
// Backward includes the reference frame. A bidirectional run counts it once.
forward=std::max(1.,std::ceil(forward-1e-7));backward=std::floor(backward+1e-7);
double total=_trackingBoth?forward+backward:_trackingBackward?backward+1:forward;
_trackingPreviewTotal=NSUInteger(std::clamp(total,1.,double(INT_MAX)));
}
std::vector<dy::FlowPoint>polygon;NSData *nodes=_trackingCandidate[@"nodes"];if(_trackingSeed.kind==DYMaskBezier){auto path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));for(int i=0;i<path.count;i++)polygon.push_back({path.x[i],path.y[i]});}else if(_trackingSeed.kind==DYMaskRectangle)polygon={{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}};else for(int i=0;i<128;i++){float angle=i*(2.f*M_PI/128);polygon.push_back({.5f*std::cos(angle),.5f*std::sin(angle)});}
if(_trackingStampMotion.active)_stampSourceTracker.setMask(polygon);
_toolTracker.setMask(std::move(polygon));return YES;
}
- (BOOL)finishToolTrackingLoss:(const dy::TrackResult&)lost region:(NSString*)region atTime:(CMTime)time error:(NSError**)error {
NSString *reason=@"区域内运动不一致";
switch(lost.failure){
case dy::TrackFailure::InsufficientMatches:reason=@"可用特征点不足";break;
case dy::TrackFailure::LowConfidence:reason=@"运动可信度不足";break;
case dy::TrackFailure::OutsideFrame:reason=@"目标已离开画面";break;
case dy::TrackFailure::InvalidTransform:reason=@"运动变换过大";break;
case dy::TrackFailure::Backend:case dy::TrackFailure::InvalidFrame:reason=@"源画面或跟踪引擎异常";break;
default:break;
}
os_log(OS_LOG_DEFAULT,"dayu_tool_track_loss region=%{public}@ time=%{public}.6f reason=%{public}d features=%{public}d matches=%{public}d inliers=%{public}d confidence=%{public}.3f residual=%{public}.3f",region?:@"蒙版",CMTimeGetSeconds(time),(int)lost.failure,lost.features,lost.matches,lost.inliers,lost.confidence,lost.medianError);
NSString *detail=region?[NSString stringWithFormat:@"%@失去跟踪(%@)",region,reason]:reason;
return [self finishToolAnalysis:[NSString stringWithFormat:@"%@,已保留 %lu 帧可信轨迹;可调整区域后从此处继续",detail,(unsigned long)_trackingSamples.count] error:error];
}
- (BOOL)analyzeFrame:(FxImageTile*)tile atTime:(CMTime)time error:(NSError**)error {
if(!_trackingActive.load()||_trackingFinishing.load()){if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:nil];return NO;}_trackingInFrame.store(true);@try{
if(_trackingCancelled.load())return [self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:error];if(_trackingSingle&&_trackingSamples.count>=2)return [self finishToolAnalysis:nil error:error];if(_trackingSamples.count>=DYToolKeyLimit)return [self finishToolAnalysis:@"轨迹已到数量上限,保留已完成部分" error:error];
CMTime expected=CMTIME_IS_NUMERIC(_trackingPreviousTime)?(_trackingBackward?CMTimeSubtract(_trackingPreviousTime,_trackingFrameDuration):CMTimeAdd(_trackingPreviousTime,_trackingFrameDuration)):_trackingReferenceTime;if(!CMTIME_IS_NUMERIC(time)||time.epoch!=expected.epoch||CMTimeCompare(time,expected)!=0)return [self stopToolAnalysis:@"宿主帧序列不连续,停在最后可信帧" error:error];
dy::GrayFrame frame=[self toolGrayFrame:tile error:error];if(!frame.valid())return [self stopToolAnalysis:@"宿主未返回完整源画面" error:error];
NSDictionary *preview=nil;
dy::GrayFrame frame=[self toolGrayFrame:tile preview:_trackingSingle?nullptr:&preview error:error];
if(!frame.valid())return [self stopToolAnalysis:@"宿主未返回完整源画面" error:error];
if(!_trackingSamples.count){if(_trackingReferenceFrame.valid()&&frame.width==_trackingReferenceFrame.width&&frame.height==_trackingReferenceFrame.height){double same=0,flip=0;size_t count=0;for(int y=0;y<frame.height;y+=8)for(int x=0;x<frame.width;x+=8){float p=frame.pixels[y*frame.width+x];same+=fabs(p-_trackingReferenceFrame.pixels[y*frame.width+x]);flip+=fabs(p-_trackingReferenceFrame.pixels[(frame.height-1-y)*frame.width+x]);count++;}same/=MAX(size_t(1),count);flip/=MAX(size_t(1),count);_trackingFlip=flip<.035&&flip+.008<same&&flip<same*.8;}os_log(OS_LOG_DEFAULT,"dayu_tool_track_seed width=%{public}d height=%{public}d flip=%{public}d time=%{public}.6f",frame.width,frame.height,(int)_trackingFlip,CMTimeGetSeconds(time));}
if(_trackingFlip)for(int y=0;y<frame.height/2;y++)for(int x=0;x<frame.width;x++)std::swap(frame.pixels[y*frame.width+x],frame.pixels[(frame.height-1-y)*frame.width+x]);
if(!_trackingSamples.count){if(!_toolTracker.reset(frame,{_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle}))return [self finishToolAnalysis:@"蒙版内纹理不足,原蒙版已保留" error:error];}else if(!_toolTracker.track(frame).valid){auto lost=_toolTracker.result();NSString *reason=@"区域内运动不一致";switch(lost.failure){case dy::TrackFailure::InsufficientMatches:reason=@"可用特征点不足";break;case dy::TrackFailure::LowConfidence:reason=@"运动可信度不足";break;case dy::TrackFailure::OutsideFrame:reason=@"目标已离开画面";break;case dy::TrackFailure::InvalidTransform:reason=@"运动变换过大";break;case dy::TrackFailure::Backend:case dy::TrackFailure::InvalidFrame:reason=@"源画面或跟踪引擎异常";break;default:break;}os_log(OS_LOG_DEFAULT,"dayu_tool_track_loss time=%{public}.6f reason=%{public}d features=%{public}d matches=%{public}d inliers=%{public}d confidence=%{public}.3f residual=%{public}.3f",CMTimeGetSeconds(time),(int)lost.failure,lost.features,lost.matches,lost.inliers,lost.confidence,lost.medianError);return [self finishToolAnalysis:[NSString stringWithFormat:@"%@,已保留 %lu 帧可信轨迹;可调整蒙版后从此处继续",reason,(unsigned long)_trackingSamples.count] error:error];}
auto result=_toolTracker.result();DYMaskParameters p=DYMaskAtTime(_trackingFrozenMask,time);p.centerX=result.cx;p.centerY=result.cy;p.width=_trackingSeed.width*result.scaleX;p.height=_trackingSeed.height*result.scaleY;p.angle=_trackingSeed.angle+result.rotation;if(!dyValidMaskParameters(p))return [self stopToolAnalysis:@"跟踪变换无效,未写入错误结果" error:error];[_trackingSamples addObject:DYMaskKey(time,p,NO,result.confidence)];_trackingPreviousTime=time;
if(_trackingSamples.count==1||_trackingSamples.count%15==0)[self toolStatus:[NSString stringWithFormat:@"已分析 %lu 帧 · 置信度 %.0f%%",(unsigned long)_trackingSamples.count,result.confidence*100]];return YES;
BOOL stamp=_trackingStampMotion.active;
dy::TrackResult target,source;
if(!_trackingSamples.count){
dy::TrackerROI targetROI={_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
if(!_toolTracker.reset(frame,targetROI))
return [self finishToolAnalysis:stamp?@"覆盖区域内纹理不足,原图章已保留":@"蒙版内纹理不足,原蒙版已保留" error:error];
if(stamp&&!_stampSourceTracker.reset(frame,_trackingStampSourceSeed))
return [self finishToolAnalysis:@"取样区域内纹理不足,原图章已保留" error:error];
target=_toolTracker.result();
if(stamp)source=_stampSourceTracker.result();
}else{
target=_toolTracker.track(frame);
if(!target.valid)return [self finishToolTrackingLoss:target region:stamp?@"覆盖区域":nil atTime:time error:error];
if(stamp){
source=_stampSourceTracker.track(frame);
if(!source.valid)return [self finishToolTrackingLoss:source region:@"取样区域" atTime:time error:error];
}
}
DYMaskParameters p=DYMaskAtTime(_trackingFrozenMask,stamp?kCMTimeInvalid:time);
p.centerX=target.cx;p.centerY=target.cy;
float confidence=target.confidence;
DYStampMotion motion=_trackingStampMotion;
if(stamp){
NSArray *authoredSource=_trackingFrozenMask[@"stampSource"];
motion.sourceOffsetX=source.cx-[authoredSource[0] floatValue];
motion.sourceOffsetY=source.cy-[authoredSource[1] floatValue];
motion.sourceScaleX*=source.scaleX;motion.sourceScaleY*=source.scaleY;
motion.targetScaleX*=target.scaleX;motion.targetScaleY*=target.scaleY;
for(float scale:{motion.sourceScaleX,motion.sourceScaleY,motion.targetScaleX,motion.targetScaleY})
if(!std::isfinite(scale)||scale<1.f/16||scale>16.f)
return [self finishToolAnalysis:@"图章缩放超出跟踪范围,已保留连续可信轨迹" error:error];
confidence=std::min(confidence,source.confidence);
}else{
p.width=_trackingSeed.width*target.scaleX;p.height=_trackingSeed.height*target.scaleY;
p.angle=_trackingSeed.angle+target.rotation;
}
if(!dyValidMaskParameters(p))return [self stopToolAnalysis:@"跟踪变换无效,未写入错误结果" error:error];
[_trackingSamples addObject:DYStampKey(time,p,NO,confidence,motion)];_trackingPreviousTime=time;
if(!_trackingSingle){
if(!(_trackingBoth&&_trackingBackward&&_trackingSamples.count==1&&_trackingPreviewCompleted))++_trackingPreviewCompleted;
DYMaskParameters covered=p;
NSMutableDictionary *packet=[NSMutableDictionary dictionaryWithDictionary:preview?:@{}];
if(stamp){
covered.width*=motion.targetScaleX;covered.height*=motion.targetScaleY;
DYMaskParameters sampled=covered;
sampled.centerX=source.cx;sampled.centerY=source.cy;
sampled.width=_trackingStampSourceSeed.width*source.scaleX;
sampled.height=_trackingStampSourceSeed.height*source.scaleY;
packet[@"sourceShape"]=[NSData dataWithBytes:&sampled length:sizeof(sampled)];
}
packet[@"shape"]=[NSData dataWithBytes:&covered length:sizeof(covered)];
packet[@"nodes"]=_trackingFrozenMask[@"nodes"];
packet[@"flip"]=@(_trackingFlip);packet[@"time"]=@(CMTimeGetSeconds(time));
packet[@"completed"]=@(_trackingPreviewCompleted);
packet[@"total"]=@(MAX(_trackingPreviewTotal,_trackingPreviewCompleted));
packet[@"backward"]=@(_trackingBackward);
[self queueTrackingPreview:packet];
}
if(_trackingSamples.count==1||_trackingSamples.count%15==0){
if(stamp)os_log(OS_LOG_DEFAULT,"dayu_stamp_track_pair time=%{public}.6f target=%{public}.5f,%{public}.5f source=%{public}.5f,%{public}.5f target_scale=%{public}.4f,%{public}.4f source_scale=%{public}.4f,%{public}.4f",CMTimeGetSeconds(time),target.cx,target.cy,source.cx,source.cy,motion.targetScaleX,motion.targetScaleY,motion.sourceScaleX,motion.sourceScaleY);
}
return YES;
}@finally{_trackingInFrame.store(false);}
}
- (BOOL)cleanupAnalysis:(NSError**)error {
if(!_trackingActive.load()||_trackingFinishing.exchange(true))return YES;BOOL changed=_trackingSamples.count>1;if(changed&&!DYMergeTracking(_trackingCandidate,_trackingSamples)){[_trackingMessage release];_trackingMessage=[@"轨迹合并失败,原蒙版已保留" copy];_trackingDiscard=YES;}
if(!_trackingActive.load()||_trackingFinishing.exchange(true))return YES;BOOL changed=_trackingSamples.count>1;if(changed&&!DYMergeTracking(_trackingCandidate,_trackingSamples,_trackingFrameDuration)){[_trackingMessage release];_trackingMessage=[@"轨迹合并失败,原蒙版已保留" copy];_trackingDiscard=YES;}
_toolTracker.stop();
if(_trackingStampMotion.active)_stampSourceTracker.stop();
uint64_t generation=_trackingGeneration;BOOL second=_trackingBoth&&!_trackingBackward&&!_trackingCancelled.load()&&!_trackingDiscard;
dispatch_async(dispatch_get_main_queue(),^{if(self->_trackingGeneration!=generation)return;
if(!self->_trackingSingle)[self publishTrackingPreview];
if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL started=NO;if(a){[a startAction:self];@try{started=[[self->_apiManager apiForProtocol:@protocol(FxAnalysisAPI)]startBackwardAnalysis:kFxAnalysisLocation_GPU error:nil];}@finally{[a endAction:self];}}if(started){[self toolStatus:@"正向完成,正在从同一起点反向跟踪…"];return;}self->_trackingFinishing.store(true);}
BOOL hasResults=![self->_trackingCandidate[@"keys"]isEqual:self->_trackingFrozenMask[@"keys"]];NSString *message=self->_trackingMessage?:[NSString stringWithFormat:@"%@跟踪完成 · %lu 个轨迹键",self->_trackingBoth?@"双向":(self->_trackingBackward?@"反向":@"正向"),(unsigned long)[self->_trackingCandidate[@"keys"]count]];
if(hasResults&&!self->_trackingDiscard){id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSString *node=DYSharedMaskWithID(doc,self->_trackingMaskID)?@"shared":self->_trackingNode;NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:node document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:mask[@"stampSource"]?@"仿制图章跟踪":@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}}
CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&changed&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime);
@synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer"]];}
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxTimingAPI_v4>timing=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];id<FxCommandAPI_v2>command=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];if(CMTIME_IS_NUMERIC(timelineTime)){NSError *seekError=nil;BOOL moved=[command movePlayheadToTime:timelineTime error:&seekError];if(!moved)os_log(OS_LOG_DEFAULT,"dayu_tool_track_seek timeline=%{public}.6f code=%{public}ld",CMTimeGetSeconds(timelineTime),(long)seekError.code);}else message=[message stringByAppendingString:@";宿主未提供有效播放头位置"];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[self toolStatus:message];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
@synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer",@"previewBuffer"]];}
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxTimingAPI_v4>timing=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];id<FxCommandAPI_v2>command=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];if(CMTIME_IS_NUMERIC(timelineTime)){NSError *seekError=nil;BOOL moved=[command movePlayheadToTime:timelineTime error:&seekError];if(!moved)os_log(OS_LOG_DEFAULT,"dayu_tool_track_seek timeline=%{public}.6f code=%{public}ld",CMTimeGetSeconds(timelineTime),(long)seekError.code);}else message=[message stringByAppendingString:@";宿主未提供有效播放头位置"];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
if(self->_trackingSingle)[self toolStatus:message];
else [self postTrackingPreview:nil active:NO message:message];
});return YES;
}
+162 -29
查看文件
@@ -5,16 +5,108 @@
@implementation DYToolOSC {
id<MTLDevice> _device;id<MTLCommandQueue> _queue;CIContext *_context;
DYViewerControls *_viewerControls;CGFloat _height,_canvasWidth,_uiScale;BOOL _maskCapturing;DYPlugIn *_maskCaptureOwner;NSRect _imageRect;NSDictionary *_mask;NSMutableArray *_handles;NSBezierPath *_outline;NSInteger _lastRoute;NSUInteger _drawCount,_hitDiagnostics,_eventDiagnostics;
BOOL _stampHasSource,_stampDragging;
BOOL _stampHasSource,_stampDragging,_stampSaving,_stampNeedsRedraw;
NSPoint _stampSource,_stampStart,_stampEnd;
CMTime _stampTime;
NSString *_stampFailure,*_levelFailure;
DYLevelTransform _level;
double _levelAngle;
NSInteger _levelMode;
CMTime _levelTime;
BOOL _levelHasFirst,_levelDown,_levelSecondPress,_levelSaving;
NSPoint _levelFirst,_levelLast;
}
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{if((self=[super init])){_apiManager=manager;_viewerControls=[DYViewerControls new];_handles=[NSMutableArray new];_lastRoute=-1;_uiScale=1;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_init");}return self;}
- (void)dealloc{[_viewerControls release];[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[super dealloc];}
- (void)dealloc{[_viewerControls release];[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[_stampFailure release];[_levelFailure release];[super dealloc];}
- (FxDrawingCoordinates)drawingCoordinates{return kFxDrawingCoordinates_CANVAS;}
- (DYPlugIn*)pluginAtTime:(CMTime)time{NSString *value=nil;id<FxParameterRetrievalAPI_v6>get=[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];[get getStringParameterValue:&value fromParameter:DYCanvasSessionParameterID];@synchronized(DYToolCanvasSessions()){return [DYToolCanvasSessions()objectForKey:value];}}
- (void)clearLevelLine {
_levelHasFirst=_levelDown=_levelSecondPress=NO;
[_levelFailure release];_levelFailure=nil;
}
- (void)updateLevelFrom:(DYPlugIn *)plugin {
double angle=0;
double fallback=NSWidth(_imageRect)>0&&NSHeight(_imageRect)>0?NSWidth(_imageRect)/NSHeight(_imageRect):1;
_level=plugin?[plugin toolCanvasLevelForAspect:fallback rotation:&angle]:DYLevelTransform(0,fallback);
if(_levelMode!=_viewerControls.levelMode||_levelAngle!=angle)[self clearLevelLine];
_levelMode=_viewerControls.levelMode;_levelAngle=angle;
}
- (NSPoint)displayUV:(NSPoint)point {
return NSMakePoint((point.x-NSMinX(_imageRect))/NSWidth(_imageRect),(point.y-NSMinY(_imageRect))/NSHeight(_imageRect));
}
- (NSPoint)clampedDisplayUV:(NSPoint)point {
NSPoint uv=[self displayUV:point];
return NSMakePoint(std::clamp(uv.x,0.,1.),std::clamp(uv.y,0.,1.));
}
- (NSPoint)canvasDisplayPoint:(NSPoint)uv {
return NSMakePoint(NSMinX(_imageRect)+uv.x*NSWidth(_imageRect),NSMinY(_imageRect)+uv.y*NSHeight(_imageRect));
}
- (void)commitLevel:(double)angle plugin:(DYPlugIn *)plugin {
if(_levelSaving)return;
_levelSaving=YES;
DYViewerParameterBridge *bridge=_viewerControls.bridge;
[plugin saveCanvasLevel:angle replacing:_levelAngle completion:^(NSString *failure){
@synchronized(self){
self->_levelSaving=NO;
if(self->_viewerControls.bridge!=bridge||!self->_viewerControls.levelMode)return;
[self clearLevelLine];
self->_levelFailure=[failure copy];
}
}];
}
- (BOOL)handleLevelEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part key:(unichar)key time:(CMTime)time plugin:(DYPlugIn *)plugin {
if(!_levelMode||!plugin)return NO;
if(type==NSEventTypeKeyDown&&key==27){
_viewerControls.levelMode=0;[self clearLevelLine];return YES;
}
// FCP's drawing and event callbacks may report different sample times.
// Compare events only and leave room for the host's sub-frame drift.
if(_levelHasFirst&&(type==NSEventTypeLeftMouseDown||type==NSEventTypeLeftMouseUp)&&
(time.epoch!=_levelTime.epoch||fabs(CMTimeGetSeconds(CMTimeSubtract(time,_levelTime)))>.05))[self clearLevelLine];
if(type==NSEventTypeLeftMouseDown&&part==10015){
if(_levelSaving)return YES;
[_levelFailure release];_levelFailure=nil;
_levelDown=YES;_levelSecondPress=_levelHasFirst;
_levelLast=[self clampedDisplayUV:point];
if(!_levelHasFirst){_levelFirst=_levelLast;_levelTime=time;_levelHasFirst=YES;}
return YES;
}
if(!_levelDown||(type!=NSEventTypeLeftMouseDragged&&type!=NSEventTypeLeftMouseUp))return NO;
_levelLast=[self clampedDisplayUV:point];
if(type==NSEventTypeLeftMouseUp){
_levelDown=NO;
double distance=hypot((_levelLast.x-_levelFirst.x)*NSWidth(_imageRect),(_levelLast.y-_levelFirst.y)*NSHeight(_imageRect));
if(distance>=5*_uiScale){
double delta=DYLevelDelta(_levelFirst,_levelLast,_level.aspect,_levelMode==2);
double corrected=std::remainder(_levelAngle+delta,2*M_PI);
[self commitLevel:fabs(corrected)<1e-7?0:corrected plugin:plugin];
}else if(_levelSecondPress){
_levelFailure=[@"两点太近,请重新选择第二点。" copy];
}
}
return YES;
}
- (void)drawLevelControls {
if(!_levelMode)return;
NSRect viewport=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));
CGFloat scale=MIN(_uiScale,NSWidth(viewport)/325.);
NSRect prompt=NSMakeRect(NSMinX(viewport)+8*scale,NSMinY(viewport)+8*scale,290*scale,26*scale);
DYDrawSoftControl(prompt,4*scale,NO,NO,NO);
NSString *title=_levelFailure?:(_levelSaving?@"正在保存水平校正…":_levelHasFirst?@"选择参考线终点 · Esc 退出":@"点击两点或拖出参考线 · Esc 退出");
[title drawInRect:NSInsetRect(prompt,6*scale,5*scale) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:12*scale]}];
if(!_levelHasFirst)return;
NSPoint first=[self canvasDisplayPoint:_levelFirst],last=[self canvasDisplayPoint:_levelLast];
[NSGraphicsContext saveGraphicsState];NSRectClip(viewport);
NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:first];[line lineToPoint:last];
for(NSValue *value in @[[NSValue valueWithPoint:first],[NSValue valueWithPoint:last]]){
NSPoint point=value.pointValue;CGFloat r=3*_uiScale;
[line appendBezierPathWithOvalInRect:NSMakeRect(point.x-r,point.y-r,2*r,2*r)];
}
[NSColor.blackColor setStroke];line.lineWidth=3.5*_uiScale;[line stroke];
[NSColor.systemCyanColor setStroke];line.lineWidth=1.5*_uiScale;[line stroke];
[NSGraphicsContext restoreGraphicsState];
}
- (NSPoint)canvasPoint:(float)x y:(float)y parameters:(DYMaskParameters)p{
float ca=cos(p.angle),sa=sin(p.angle),aspect=p.imageAspect;float px=x*p.width*aspect,py=y*p.height;float u=p.centerX+(px*ca-py*sa)/aspect,v=p.centerY+px*sa+py*ca;return NSMakePoint(_imageRect.origin.x+u*_imageRect.size.width,_imageRect.origin.y+v*_imageRect.size.height);
float ca=cos(p.angle),sa=sin(p.angle),aspect=p.imageAspect;float px=x*p.width*aspect,py=y*p.height;float u=p.centerX+(px*ca-py*sa)/aspect,v=p.centerY+px*sa+py*ca;return [self canvasStampSource:NSMakePoint(u,v)];
}
- (void)addHandle:(NSPoint)p part:(NSInteger)part{[_handles addObject:@{@"point":[NSValue valueWithPoint:p],@"part":@(part)}];}
- (NSRect)toolbarRectForItem:(NSInteger)item{
@@ -23,10 +115,9 @@
NSRect v=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));CGFloat scale=MAX(.01,MIN(_uiScale,MIN(v.size.width/300.,v.size.height/100.)));
return NSMakeRect(NSMinX(v)+(item==9?8:76)*scale,NSMaxY(v)-61*scale,64*scale,24*scale);
}
- (void)updateStampAtTime:(CMTime)time{
if(!_viewerControls.stampArmed||!CMTIME_IS_NUMERIC(time)||!CMTIME_IS_NUMERIC(_stampTime)||CMTimeCompare(_stampTime,time)!=0){
_stampHasSource=_stampDragging=NO;_stampTime=time;
}
- (void)clearStampCreation{
_stampHasSource=_stampDragging=NO;
[_stampFailure release];_stampFailure=nil;
}
- (NSRect)stampControlRect:(NSInteger)index{
NSRect viewport=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));
@@ -36,8 +127,11 @@
- (NSRect)stampTarget{
return NSMakeRect(MIN(_stampStart.x,_stampEnd.x),MIN(_stampStart.y,_stampEnd.y),fabs(_stampStart.x-_stampEnd.x),fabs(_stampStart.y-_stampEnd.y));
}
- (NSPoint)canvasStampSource:(NSPoint)source{
return [self canvasDisplayPoint:_level.toOutput(source)];
}
- (void)drawStampSource:(NSPoint)source{
NSPoint p=NSMakePoint(NSMinX(_imageRect)+source.x*NSWidth(_imageRect),NSMinY(_imageRect)+source.y*NSHeight(_imageRect));
NSPoint p=[self canvasStampSource:source];
CGFloat r=8*_uiScale;
NSBezierPath *mark=[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(p.x-r,p.y-r,2*r,2*r)];
[mark moveToPoint:NSMakePoint(p.x-r,p.y)];[mark lineToPoint:NSMakePoint(p.x+r,p.y)];
@@ -50,13 +144,19 @@
if(_viewerControls.stampArmed){
NSRect cell=NSUnionRect([self stampControlRect:0],[self stampControlRect:3]);
DYDrawSoftControl(cell,4,NO,NO,NO);
NSString *prompt=_stampHasSource?@"拖出要覆盖的椭圆 · Esc 取消":@"点击画面选择取样中心 · Esc 取消";
NSString *prompt=_stampSaving?@"正在保存仿制图章…":_stampFailure?:(_stampHasSource?@"拖出要覆盖的椭圆 · Esc 取消":@"点击画面选择取样中心 · Esc 取消");
[prompt drawInRect:NSInsetRect(cell,6,4) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:MAX(8.,NSHeight(cell)*.48)]}];
if(_stampHasSource)[self drawStampSource:_stampSource];
if(_stampDragging){
if(_stampDragging||_stampSaving||_stampFailure){
NSRect target=[self stampTarget];
NSRect oval=NSMakeRect(NSMinX(_imageRect)+target.origin.x*NSWidth(_imageRect),NSMinY(_imageRect)+target.origin.y*NSHeight(_imageRect),target.size.width*NSWidth(_imageRect),target.size.height*NSHeight(_imageRect));
NSBezierPath *outline=[NSBezierPath bezierPathWithOvalInRect:oval];outline.lineWidth=2*_uiScale;[NSColor.systemCyanColor setStroke];[outline stroke];
NSBezierPath *outline=[NSBezierPath bezierPath];
for(int i=0;i<64;i++){
double angle=i*(2*M_PI/64);
NSPoint uv=NSMakePoint(NSMidX(target)+cos(angle)*NSWidth(target)/2,NSMidY(target)+sin(angle)*NSHeight(target)/2);
NSPoint p=[self canvasStampSource:uv];
if(i==0)[outline moveToPoint:p];else [outline lineToPoint:p];
}
[outline closePath];outline.lineWidth=2*_uiScale;[NSColor.systemCyanColor setStroke];[outline stroke];
}
}else if(source.count==4){
[self drawStampSource:NSMakePoint([source[0]doubleValue],[source[1]doubleValue])];
@@ -75,9 +175,10 @@
id<FxOnScreenControlAPI_v4>api=[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)];double lx=0,ly=0,ux=0,uy=0;[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:0 fromY:0 toSpace:kFxDrawingCoordinates_CANVAS toX:&lx toY:&ly];[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:1 fromY:1 toSpace:kFxDrawingCoordinates_CANVAS toX:&ux toY:&uy];_imageRect=NSMakeRect(lx,_height-uy,ux-lx,uy-ly);_uiScale=[api respondsToSelector:@selector(backingScaleFactor)]?MAX(1.,MIN(3.,[api backingScaleFactor])):1.;
DYPlugIn *plugin=[self pluginAtTime:time];NSDictionary *mask=[plugin toolCanvasMaskAtTime:time];NSInteger route=(plugin?1:0)+(mask?2:0);if(route!=_lastRoute||_drawCount++<2){_lastRoute=route;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_route plugin=%{public}d mask=%{public}d width=%{public}.2f height=%{public}.2f",plugin!=nil,mask!=nil,_imageRect.size.width,_imageRect.size.height);}[_mask release];_mask=[mask copy];[_handles removeAllObjects];[_outline release];_outline=nil;
[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(canvasWidth,_height) scale:_uiScale atTime:time];
[self updateLevelFrom:plugin];
if(_levelMode)mask=nil;
if(plugin&&canvasWidth>0&&_height>0&&canvasWidth<16384&&_height<16384&&_imageRect.size.width>0&&_imageRect.size.height>0){
[self updateStampAtTime:time];
NSRect region=mask||_viewerControls.stampArmed?NSMakeRect(0,0,canvasWidth,_height):NSIntegralRect([_viewerControls drawingBounds]);
NSRect region=mask||_viewerControls.stampArmed||_levelMode?NSMakeRect(0,0,canvasWidth,_height):NSIntegralRect([_viewerControls drawingBounds]);
if(NSIsEmptyRect(region)){[commands commit];[commands waitUntilCompleted];return;}
NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:(NSInteger)NSWidth(region) pixelsHigh:(NSInteger)NSHeight(region) bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:(NSInteger)NSWidth(region)*4 bitsPerPixel:32]autorelease];
if(!bitmap){[commands commit];[commands waitUntilCompleted];return;}
@@ -88,31 +189,36 @@
[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithCGContext:NSGraphicsContext.currentContext.CGContext flipped:YES]];
if(mask){BOOL blankShape=[mask[@"drawShape"]boolValue]&&![mask[@"shapeStarted"]boolValue];DYMaskParameters p;[mask[@"parameters"]getBytes:&p length:sizeof(p)];p.imageAspect=_imageRect.size.width/_imageRect.size.height;_outline=[[NSBezierPath bezierPath]retain];
if(p.kind==DYMaskBezier){NSData *data=mask[@"nodes"];auto *nodes=(const DYBezierNode*)data.bytes;NSUInteger count=data.length/sizeof(DYBezierNode);for(NSUInteger i=0;i<count;i++){NSPoint anchor=[self canvasPoint:nodes[i].x y:nodes[i].y parameters:p];if(i==0)[_outline moveToPoint:anchor];else{auto a=nodes[i-1],b=nodes[i];[_outline curveToPoint:anchor controlPoint1:[self canvasPoint:a.outX y:a.outY parameters:p] controlPoint2:[self canvasPoint:b.inX y:b.inY parameters:p]];}[self addHandle:anchor part:1000+i*3];for(int j=0;j<2;j++){NSPoint handle=[self canvasPoint:j?nodes[i].outX:nodes[i].inX y:j?nodes[i].outY:nodes[i].inY parameters:p];if(hypot(handle.x-anchor.x,handle.y-anchor.y)>3){NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:anchor];[line lineToPoint:handle];[[NSColor colorWithWhite:1 alpha:.55]setStroke];[line stroke];[self addHandle:handle part:1000+i*3+j+1];}}}
NSArray *hover=mask[@"hover"];if(count&&[mask[@"drawing"]boolValue]&&hover.count==2){NSPoint target=NSMakePoint(_imageRect.origin.x+[hover[0]doubleValue]*_imageRect.size.width,_imageRect.origin.y+[hover[1]doubleValue]*_imageRect.size.height);[_outline curveToPoint:target controlPoint1:[self canvasPoint:nodes[count-1].outX y:nodes[count-1].outY parameters:p] controlPoint2:target];}
NSArray *hover=mask[@"hover"];if(count&&[mask[@"drawing"]boolValue]&&hover.count==2){NSPoint target=[self canvasStampSource:NSMakePoint([hover[0]doubleValue],[hover[1]doubleValue])];[_outline curveToPoint:target controlPoint1:[self canvasPoint:nodes[count-1].outX y:nodes[count-1].outY parameters:p] controlPoint2:target];}
if(count>=3&&![mask[@"drawing"]boolValue]){auto a=nodes[count-1],b=nodes[0];[_outline curveToPoint:[self canvasPoint:b.x y:b.y parameters:p] controlPoint1:[self canvasPoint:a.outX y:a.outY parameters:p] controlPoint2:[self canvasPoint:b.inX y:b.inY parameters:p]];[_outline closePath];}
}else if(p.kind<2&&!blankShape){int count=p.kind==DYMaskEllipse?96:4;for(int i=0;i<count;i++){float angle=i*(2.f*M_PI/count),x=p.kind==DYMaskEllipse?.5f*cosf(angle):((float[]){-.5,.5,.5,-.5})[i],y=p.kind==DYMaskEllipse?.5f*sinf(angle):((float[]){-.5,-.5,.5,.5})[i];NSPoint point=[self canvasPoint:x y:y parameters:p];if(i==0)[_outline moveToPoint:point];else[_outline lineToPoint:point];}[_outline closePath];}
else if(p.kind==DYMaskLinearGradient){[_outline moveToPoint:[self canvasPoint:0 y:-2 parameters:p]];[_outline lineToPoint:[self canvasPoint:0 y:2 parameters:p]];}
if([mask[@"coverage"]boolValue]&&p.kind<3){[[NSColor colorWithCalibratedRed:1 green:.7 blue:.05 alpha:.2]setFill];[_outline fill];}
[[NSColor colorWithWhite:0 alpha:.8]setStroke];_outline.lineWidth=3.5*_uiScale;[_outline stroke];[[NSColor colorWithCalibratedRed:1 green:.8 blue:.15 alpha:1]setStroke];_outline.lineWidth=1.5*_uiScale;[_outline stroke];
if(p.kind<4&&![mask[@"drawing"]boolValue]&&![mask[@"drawShape"]boolValue]){[self addHandle:[self canvasPoint:0 y:0 parameters:p] part:1];if(p.kind!=DYMaskBezier){for(int i=0;i<4;i++)[self addHandle:[self canvasPoint:((float[]){-.5,.5,.5,-.5})[i] y:((float[]){-.5,-.5,.5,.5})[i] parameters:p] part:2+i];}[self addHandle:[self canvasPoint:0 y:-.68 parameters:p] part:6];}
if(p.kind<4&&![mask[@"drawing"]boolValue]&&![mask[@"drawShape"]boolValue]){[self addHandle:[self canvasPoint:0 y:0 parameters:p] part:1];if(p.kind!=DYMaskBezier){for(int i=0;i<4;i++)[self addHandle:[self canvasPoint:((float[]){-.5,.5,.5,-.5})[i] y:((float[]){-.5,-.5,.5,.5})[i] parameters:p] part:2+i];}if(![mask[@"stampSource"]count])[self addHandle:[self canvasPoint:0 y:-.68 parameters:p] part:6];}
for(NSDictionary *handle in _handles){NSPoint point=[handle[@"point"]pointValue];NSRect rect=NSMakeRect(point.x-4*_uiScale,point.y-4*_uiScale,8*_uiScale,8*_uiScale);[[NSColor colorWithWhite:.1 alpha:1]setFill];[[NSBezierPath bezierPathWithOvalInRect:rect]fill];[NSColor.whiteColor setStroke];[[NSBezierPath bezierPathWithOvalInRect:rect]stroke];}
if([mask[@"drawing"]boolValue]){
NSShadow *shadow=[[[NSShadow alloc]init]autorelease];shadow.shadowColor=[NSColor colorWithWhite:0 alpha:.95];shadow.shadowBlurRadius=2;shadow.shadowOffset=NSZeroSize;
NSMutableParagraphStyle *style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.alignment=NSTextAlignmentCenter;
for(NSInteger item=9;item<=10;item++){NSString *title=item==9?@"✓ 完成":@"取消";NSRect cell=[self toolbarRectForItem:item];CGFloat size=cell.size.height*.48;[title drawInRect:NSInsetRect(cell,0,MAX(0.,(cell.size.height-size-3)/2))withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:size weight:NSFontWeightMedium],NSForegroundColorAttributeName:NSColor.whiteColor,NSShadowAttributeName:shadow,NSParagraphStyleAttributeName:style}];}
}
}[self drawStampControls];[_viewerControls draw];
}if(_levelMode)[self drawLevelControls];else [self drawStampControls];[_viewerControls draw];
[NSGraphicsContext restoreGraphicsState];CIImage *overlay=[CIImage imageWithCGImage:bitmap.CGImage options:@{kCIImageColorSpace:NSNull.null}];overlay=[overlay imageByApplyingTransform:CGAffineTransformMakeTranslation(NSMinX(region),texture.height-NSMaxY(region))];[_context render:overlay toMTLTexture:texture commandBuffer:commands bounds:CGRectMake(0,0,texture.width,texture.height) colorSpace:nil];
}[commands commit];[commands waitUntilCompleted];
}}}
- (NSInteger)partAtPoint:(NSPoint)point {
BOOL drawing=[_mask[@"drawing"]boolValue];
if(drawing)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;
if(drawing&&!_levelMode)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;
NSInteger viewerHit=[_viewerControls partAtPoint:point];if(viewerHit)return viewerHit;
if(_levelMode)return NSPointInRect(point,_imageRect)?10015:0;
if(_viewerControls.stampArmed)return NSPointInRect(point,_imageRect)?10014:0;
if([_mask[@"stampSource"]count]==4){
NSInteger count=[_mask[@"tracking"]boolValue]?1:3;
NSArray *source=_mask[@"stampSource"];
if(source.count==4){
BOOL tracking=[_mask[@"tracking"]boolValue];
NSInteger count=tracking?1:3;
for(NSInteger i=0;i<count;i++)if(NSPointInRect(point,[self stampControlRect:i]))return 10011+i;
NSPoint cross=[self canvasStampSource:NSMakePoint([source[0]doubleValue],[source[1]doubleValue])];
if(!tracking&&NSPointInRect(point,_imageRect)&&hypot(cross.x-point.x,cross.y-point.y)<=12*_uiScale)return DYCloneSourcePart;
}
if(!_mask)return 0;if([_mask[@"drawShape"]boolValue])return NSPointInRect(point,_imageRect)?1:0;
DYMaskParameters p;[_mask[@"parameters"]getBytes:&p length:sizeof(p)];p.imageAspect=_imageRect.size.width/MAX(1.,_imageRect.size.height);
@@ -120,21 +226,26 @@
for(NSDictionary *h in _handles){NSPoint q=[h[@"point"]pointValue];if(hypot(q.x-point.x,q.y-point.y)<=9*_uiScale)return [h[@"part"]integerValue];}
if(p.kind==DYMaskBezier||p.kind==DYMaskLinearGradient||[_outline containsPoint:point])return 1;return 0;
}
- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}}
- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];[self updateLevelFrom:plugin];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}}
- (BOOL)event:(NSEventType)type x:(double)x y:(double)y part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time {@synchronized(self){
DYPlugIn *plugin=[self pluginAtTime:time];if(_eventDiagnostics++<12)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_event type=%{public}ld part=%{public}ld x=%{public}.2f y=%{public}.2f plugin=%{public}d",(long)type,(long)part,x,y,plugin!=nil);[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSPoint canvasPoint=NSMakePoint(x,_height-y);
if(_maskCapturing&&plugin!=_maskCaptureOwner){_maskCapturing=NO;_maskCaptureOwner=nil;return NO;}
[self updateStampAtTime:time];
[self updateLevelFrom:plugin];
if(_stampSaving)return YES;
if([self handleLevelEvent:type point:canvasPoint part:part key:key time:time plugin:plugin])return YES;
if(!_viewerControls.stampArmed)[self clearStampCreation];
if(type==NSEventTypeKeyDown&&key==27&&_viewerControls.stampArmed){
_viewerControls.stampArmed=NO;[self updateStampAtTime:time];return YES;
_viewerControls.stampArmed=NO;[self clearStampCreation];return YES;
}
if(type==NSEventTypeLeftMouseDown&&part>=10011&&part<=10013){
NSInteger direction=[_mask[@"tracking"]boolValue]?9:part-10012;
[plugin trackCloneStamp:_mask[@"id"] direction:direction];return YES;
}
if(plugin&&_viewerControls.stampArmed&&NSWidth(_imageRect)>0&&NSHeight(_imageRect)>0){
NSPoint uv=NSMakePoint(fmax(0,fmin(1,(x-NSMinX(_imageRect))/NSWidth(_imageRect))),fmax(0,fmin(1,(canvasPoint.y-NSMinY(_imageRect))/NSHeight(_imageRect))));
NSPoint uv=_level.toSource([self clampedDisplayUV:canvasPoint]);
uv=NSMakePoint(std::clamp(uv.x,0.,1.),std::clamp(uv.y,0.,1.));
if(type==NSEventTypeLeftMouseDown&&part==10014){
[_stampFailure release];_stampFailure=nil;
if(!_stampHasSource){_stampSource=uv;_stampHasSource=YES;}
else {_stampStart=_stampEnd=uv;_stampDragging=YES;}
return YES;
@@ -144,7 +255,21 @@
if(type==NSEventTypeLeftMouseUp){
NSRect target=[self stampTarget];_stampDragging=NO;
if(NSWidth(target)>=.001&&NSHeight(target)>=.001&&NSWidth(target)*NSWidth(_imageRect)>=3*_uiScale&&NSHeight(target)*NSHeight(_imageRect)>=3*_uiScale){
[plugin addCloneStampFrom:_stampSource target:target atTime:time];_viewerControls.stampArmed=NO;[self updateStampAtTime:time];
_stampSaving=YES;
DYViewerParameterBridge *bridge=_viewerControls.bridge;
[plugin addCloneStampFrom:_stampSource target:target atTime:time completion:^(NSString *failure){
@synchronized(self){
self->_stampSaving=NO;
if(self->_viewerControls.bridge!=bridge||!self->_viewerControls.stampArmed){[self clearStampCreation];return;}
self->_stampNeedsRedraw=YES;
if(failure){
[self->_stampFailure release];self->_stampFailure=[failure copy];
}else{
self->_viewerControls.stampArmed=NO;
[self clearStampCreation];
}
}
}];
}
}
return YES;
@@ -153,9 +278,14 @@
BOOL ownedMask=_maskCapturing&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp);
if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture];
BOOL penAction=type==NSEventTypeLeftMouseDown&&(part==10009||part==10010);
if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES;
if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time]){
[self updateLevelFrom:plugin];
if(_viewerControls.levelResetRequested){_viewerControls.levelResetRequested=NO;[self commitLevel:0 plugin:plugin];}
return YES;
}
if(_levelMode)return NO;
if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0){_maskCapturing=NO;return NO;}
NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height);
NSPoint point=_level.toSource([self displayUV:canvasPoint]);
if(type==NSEventTypeLeftMouseDown){_maskCapturing=part>0&&part<10000;_maskCaptureOwner=_maskCapturing?plugin:nil;}
[plugin toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];if(type==NSEventTypeLeftMouseUp||(type==NSEventTypeKeyDown&&key==27)){_maskCapturing=NO;_maskCaptureOwner=nil;}return YES;
}}
@@ -164,7 +294,10 @@
- (void)mouseUpAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseUp x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;}
- (void)keyDownAtPositionX:(double)x positionY:(double)y keyPressed:(unsigned short)key modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update didHandle:(BOOL*)handled atTime:(CMTime)t{BOOL result=(key==27||key==13||key==10||key==3||key==8||key==127)&&[self event:NSEventTypeKeyDown x:x y:y part:1 modifiers:m key:key time:t];if(update)*update=result;if(handled)*handled=result;}
- (void)mouseMovedAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){
DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue]||[mask[@"drawShape"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:part==10014?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if([mask[@"drawing"]boolValue]&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=redraw||[mask[@"drawing"]boolValue];
DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];[self updateLevelFrom:plugin];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue]||[mask[@"drawShape"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:(part==10014||part==10015)?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(_levelMode&&_levelHasFirst&&!_levelDown&&!_levelSaving&&!viewerHit&&part==10015){
_levelLast=[self clampedDisplayUV:point];redraw=YES;
}else if(!_levelMode&&[mask[@"drawing"]boolValue]&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];
if(update)*update=redraw||(!_levelMode&&[mask[@"drawing"]boolValue])||_stampNeedsRedraw;_stampNeedsRedraw=NO;
}}
- (void)mouseEnteredAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{[self mouseMovedAtPositionX:x positionY:y activePart:0 modifiers:m forceUpdate:update atTime:t];}
- (void)mouseExitedAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){BOOL changed=[_viewerControls mouseExited];if(update)*update=changed;}}
+20 -4
查看文件
@@ -13,12 +13,27 @@
id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"dyToolBlend"]];[encoder setTexture:before atIndex:0];[encoder setTexture:after atIndex:1];[encoder setTexture:output atIndex:2];[encoder setBuffer:masks offset:0 atIndex:0];[encoder setBytes:&h length:sizeof(h) atIndex:1];[encoder dispatchThreads:MTLSizeMake(output.width,output.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
}
- (BOOL)copyTile:(FxImageTile*)source to:(FxImageTile*)dest entry:(NSMutableDictionary*)e error:(NSError**)error {
return [self copyTile:source to:dest rotation:0 entry:e error:error];
}
- (BOOL)copyTile:(FxImageTile*)source to:(FxImageTile*)dest rotation:(double)angle entry:(NSMutableDictionary*)e error:(NSError**)error {
id<MTLDevice>device=e[@"device"];id<MTLTexture>a=[source metalTextureForDevice:device],b=[dest metalTextureForDevice:device];
NSMutableDictionary *pipelines=e[@"pipelines"];NSString *key=[NSString stringWithFormat:@"copy-%d-%lu",_managedFinishing,(unsigned long)b.pixelFormat];id<MTLRenderPipelineState>pipeline=pipelines[key];
if(!pipeline){MTLRenderPipelineDescriptor *desc=[MTLRenderPipelineDescriptor new];desc.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];desc.fragmentFunction=[e[@"library"]newFunctionWithName:_managedFinishing?@"dyManagedCopyFragment":@"dyToolCopyFragment"];desc.colorAttachments[0].pixelFormat=b.pixelFormat;pipeline=[device newRenderPipelineStateWithDescriptor:desc error:error];[desc.vertexFunction release];[desc.fragmentFunction release];[desc release];if(!pipeline)return NO;pipelines[key]=pipeline;[pipeline release];}
if(!a||!b)return fail(error,@"宿主图像纹理不可用");
BOOL useFloat=_managedFinishing||angle!=0;
NSMutableDictionary *pipelines=e[@"pipelines"];NSString *key=[NSString stringWithFormat:@"copy-%d-%lu",useFloat,(unsigned long)b.pixelFormat];id<MTLRenderPipelineState>pipeline=pipelines[key];
if(!pipeline){MTLRenderPipelineDescriptor *desc=[MTLRenderPipelineDescriptor new];desc.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];desc.fragmentFunction=[e[@"library"]newFunctionWithName:useFloat?@"dyManagedCopyFragment":@"dyToolCopyFragment"];desc.colorAttachments[0].pixelFormat=b.pixelFormat;pipeline=[device newRenderPipelineStateWithDescriptor:desc error:error];[desc.vertexFunction release];[desc.fragmentFunction release];[desc release];if(!pipeline)return NO;pipelines[key]=pipeline;[pipeline release];}
FxRect s=source.tilePixelBounds,t=dest.tilePixelBounds;float width=s.right-s.left,height=s.top-s.bottom,l=(t.left-s.left)/width,r=(t.right-s.left)/width,top=(s.top-t.top)/height,bottom=(s.top-t.bottom)/height;
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT){top=1-top;bottom=1-bottom;}
float w=b.width,h=b.height;DYVertex2D v[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}};if(dest.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)for(auto &vertex:v)vertex.position.y=-vertex.position.y;
float w=b.width,h=b.height;DYVertex2D v[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}};
double pixelAspect=source.pixelAspect;
if(!std::isfinite(pixelAspect)||pixelAspect<=0)pixelAspect=1;
DYLevelTransform level(angle,width*pixelAspect/height);
for(auto &vertex:v){
if(angle){
CGPoint uv=level.toSource(CGPointMake(vertex.textureCoordinate.x,vertex.textureCoordinate.y));
vertex.textureCoordinate={(float)uv.x,(float)uv.y};
}
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)vertex.textureCoordinate.y=1-vertex.textureCoordinate.y;
if(dest.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)vertex.position.y=-vertex.position.y;
}
vector_uint2 size={(unsigned)b.width,(unsigned)b.height};id<MTLCommandBuffer>cb=[e[@"queue"]commandBuffer];MTLRenderPassDescriptor *pass=[MTLRenderPassDescriptor renderPassDescriptor];pass.colorAttachments[0].texture=b;pass.colorAttachments[0].loadAction=MTLLoadActionDontCare;pass.colorAttachments[0].storeAction=MTLStoreActionStore;id<MTLRenderCommandEncoder>encoder=[cb renderCommandEncoderWithDescriptor:pass];[encoder setRenderPipelineState:pipeline];[encoder setVertexBytes:v length:sizeof(v) atIndex:0];[encoder setVertexBytes:&size length:sizeof(size) atIndex:1];[encoder setFragmentTexture:a atIndex:0];[encoder drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];[encoder endEncoding];[cb commit];[cb waitUntilCompleted];return cb.status==MTLCommandBufferStatusCompleted?YES:fail(error,cb.error.localizedDescription);
}
// Extra skin keeps the source reference used by the prior release. All other
@@ -101,6 +116,7 @@
});}}
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){
if(tools&&!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
if([tools[@"levelRotation"]doubleValue]!=0)return fail(error,@"水平校正属于空间处理,请保存完整预设。");
for(NSDictionary *mask in DYSharedMasks(tools))if(mask[@"stampSource"]&&[mask[@"enabled"]boolValue])return fail(error,@"仿制图章属于空间处理,请保存完整预设。");
if((u.lensSectionEnabled>.5&&(u.lensStrength!=0||u.lensScale!=1))||(u.skinProtection.x>.5&&u.skinVisualize>.5))return fail(error,@"镜头修复与肤色区域显示无法保存到 Cube,请保存完整预设。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"lens"]&&!DYToolIsNeutral(node))return fail(error,@"镜头畸变属于空间处理,请保存完整预设。");}
DYUniforms effective=u;if(![paths[@"input"]length]&&effective.inputProfile==0)effective.preLUTStrength=0;if(![paths[@"look0"]length])effective.postLUTStrength=0;for(int i=0;i<4;i++)if(![paths[[NSString stringWithFormat:@"look%d",i+1]]length])effective.extraPostLUTStrengths[i]=0;bypassNeutralTools(&effective);bypassIdleSkin(&effective);if(effective.skinFaceOnly>.5&&effective.skinProtection.x>.5&&effective.skinProtection.y>0)return fail(error,@"人脸限定肤色保护属于空间选区,Cube 无法保存。请保存完整预设,或关闭人脸限定后导出。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"skin"]&&layer.skinProtection.x>.5&&layer.skinProtection.y>0&&(layer.skinFaceOnly>.5||layer.skinVisualize>.5))return fail(error,@"新增肤色层含人脸空间选区,请保存完整预设。");}
+11 -1
查看文件
@@ -26,6 +26,7 @@ NSDictionary *DYNewMask(NSInteger kind);
BOOL DYValidToolDocument(NSDictionary *document);
BOOL DYValidToolMask(NSDictionary *mask);
NSMutableDictionary *DYMutablePlist(NSDictionary *value);
NSDictionary *DYInitialToolDocument(NSString *starter);
DYToolDocument *DYReadTools(id<PROAPIAccessing> manager,CMTime time);
BOOL DYWriteTools(id<PROAPIAccessing> manager,NSDictionary *document,CMTime time);
NSArray *DYMasksForTool(NSDictionary *document,NSString *nodeID);
@@ -45,7 +46,16 @@ NSDictionary *DYShareToolMask(NSMutableDictionary *document,NSString *nodeID,NSS
NSDictionary *DYResolvedToolDocument(NSDictionary *document);
DYMaskParameters DYMaskAtTime(NSDictionary *mask,CMTime time);
NSDictionary *DYMaskKey(CMTime time,DYMaskParameters parameters,BOOL manual,float confidence);
BOOL DYMergeTracking(NSMutableDictionary *mask,NSArray *samples);
struct DYStampMotion {
float sourceOffsetX=0,sourceOffsetY=0;
float sourceScaleX=1,sourceScaleY=1,targetScaleX=1,targetScaleY=1;
bool active=false;
};
DYStampMotion DYStampMotionAtTime(NSDictionary *stamp,CMTime time);
NSArray *DYStampSourceAtTime(NSDictionary *stamp,CMTime time);
NSArray *DYStampSamplingScaleAtTime(NSDictionary *stamp,CMTime time);
NSDictionary *DYStampKey(CMTime time,DYMaskParameters parameters,BOOL manual,float confidence,DYStampMotion motion);
BOOL DYMergeTracking(NSMutableDictionary *mask,NSArray *samples,CMTime frameDuration=kCMTimeInvalid);
NSDictionary *DYToolRenderSnapshot(NSDictionary *document,CMTime time);
DYUniforms DYToolUniforms(NSDictionary *node);
BOOL DYToolIsNeutral(NSDictionary *node);
+189 -8
查看文件
@@ -1,3 +1,4 @@
#include <numeric>
#import "DYToolState.h"
#include "DYSpiderState.h"
#include "DYFilmMath.h"
@@ -60,8 +61,26 @@ NSMutableDictionary *DYMutablePlist(NSDictionary *value){
if(!value)return [NSMutableDictionary dictionary];
return [(NSMutableDictionary*)CFPropertyListCreateDeepCopy(kCFAllocatorDefault,(CFPropertyListRef)value,kCFPropertyListMutableContainersAndLeaves) autorelease];
}
static NSDictionary *DYEmptyTools(){return @{@"schema":@1,@"layers":@[],@"baseMasks":@{}};}
NSDictionary *DYInitialToolDocument(NSString *starter) {
NSMutableDictionary *doc=[NSMutableDictionary dictionaryWithDictionary:@{@"schema":@1,@"layers":@[],@"baseMasks":@{}}];
if([starter isEqual:@"primary"]||[starter isEqual:@"hsl"]){
NSMutableArray *removed=[NSMutableArray arrayWithArray:DYToolTypes()];
[removed removeObject:starter];
doc[@"removedBase"]=removed;
doc[@"starterTool"]=starter;
}
return doc;
}
static BOOL finiteNumber(id v){return [v isKindOfClass:NSNumber.class]&&std::isfinite([v doubleValue]);}
static BOOL validStampValues(id values,NSUInteger count,NSUInteger offsets,double minScale,double maxScale){
if(![values isKindOfClass:NSArray.class]||[values count]!=count)return NO;
for(NSUInteger i=0;i<count;i++){
if(!finiteNumber(values[i]))return NO;
double value=[values[i] doubleValue];
if(i<offsets?fabs(value)>1:value<minScale||value>maxScale)return NO;
}
return YES;
}
static BOOL validID(id v){return [v isKindOfClass:NSString.class]&&[[[NSUUID alloc]initWithUUIDString:v]autorelease]!=nil;}
static NSData *parameterData(DYMaskParameters p){return [NSData dataWithBytes:&p length:sizeof(p)];}
static BOOL readParameters(id data,DYMaskParameters *p){if(![data isKindOfClass:NSData.class]||[data length]!=sizeof(*p))return NO;[data getBytes:p length:sizeof(*p)];return dyValidMaskParameters(*p);}
@@ -76,9 +95,14 @@ BOOL DYValidToolMask(NSDictionary *mask){
if(p.kind!=DYMaskEllipse||![source isKindOfClass:NSArray.class]||[source count]!=4)return NO;
for(NSUInteger i=0;i<4;i++)if(!finiteNumber(source[i])||[source[i] doubleValue]<(i<2?0:.001)||[source[i] doubleValue]>1)return NO;
}
id samplingScale=mask[@"stampSamplingScale"];
if(samplingScale&&(!source||!validStampValues(samplingScale,2,0,1./256,256)))return NO;
const float *n=(const float*)nodes.bytes;for(NSUInteger i=0;i<nodes.length/4;i++)if(!std::isfinite(n[i])||fabs(n[i])>1000)return NO;
NSArray *keys=mask[@"keys"];if(![keys isKindOfClass:NSArray.class]||keys.count>DYToolKeyLimit)return NO;CMTime last=kCMTimeInvalid;
for(NSDictionary *k in keys){if(![k isKindOfClass:NSDictionary.class]||!finiteNumber(k[@"value"])||!finiteNumber(k[@"scale"])||!finiteNumber(k[@"epoch"])||!finiteNumber(k[@"manual"])||!finiteNumber(k[@"confidence"])||[k[@"confidence"]doubleValue]<0||[k[@"confidence"]doubleValue]>1)return NO;CMTime t=keyTime(k);DYMaskParameters q;if(!CMTIME_IS_NUMERIC(t)||!readParameters(k[@"parameters"],&q)||q.kind!=p.kind||(CMTIME_IS_NUMERIC(last)&&(last.epoch!=t.epoch||CMTimeCompare(last,t)>=0)))return NO;last=t;}return YES;
for(NSDictionary *k in keys){if(![k isKindOfClass:NSDictionary.class]||!finiteNumber(k[@"value"])||!finiteNumber(k[@"scale"])||!finiteNumber(k[@"epoch"])||!finiteNumber(k[@"manual"])||!finiteNumber(k[@"confidence"])||[k[@"confidence"]doubleValue]<0||[k[@"confidence"]doubleValue]>1)return NO;CMTime t=keyTime(k);DYMaskParameters q;if(!CMTIME_IS_NUMERIC(t)||!readParameters(k[@"parameters"],&q)||q.kind!=p.kind||(CMTIME_IS_NUMERIC(last)&&(last.epoch!=t.epoch||CMTimeCompare(last,t)>=0)))return NO;
if(k[@"stampMotion"]&&(!source||!validStampValues(k[@"stampMotion"],6,2,1./16,16)))return NO;
last=t;
}return YES;
}
static BOOL validMasks(id masks,NSMutableSet *ids,NSSet *sharedIDs,BOOL references){
if(![masks isKindOfClass:NSArray.class]||[masks count]>DYToolMaskLimit)return NO;NSMutableSet *links=[NSMutableSet set];
@@ -87,6 +111,9 @@ static BOOL validMasks(id masks,NSMutableSet *ids,NSSet *sharedIDs,BOOL referenc
static NSData *DYValidatedToolData(NSDictionary *doc){
if(![NSPropertyListSerialization propertyList:doc isValidForFormat:NSPropertyListBinaryFormat_v1_0])return nil;
if(![doc isKindOfClass:NSDictionary.class]||(![doc[@"schema"]isEqual:@1]&&![doc[@"schema"]isEqual:@2]&&![doc[@"schema"]isEqual:@3])||![doc[@"layers"]isKindOfClass:NSArray.class]||[doc[@"layers"]count]>DYToolLimit||![doc[@"baseMasks"]isKindOfClass:NSDictionary.class]||[doc[@"baseMasks"]count]>DYToolTypes().count)return nil;
id starter=doc[@"starterTool"],level=doc[@"levelRotation"];
if(starter&&![starter isEqual:@"primary"]&&![starter isEqual:@"hsl"])return nil;
if(level&&(!finiteNumber(level)||fabs([level doubleValue])>M_PI))return nil;
BOOL references=[doc[@"schema"]isEqual:@3];id shared=doc[@"sharedMasks"];NSMutableSet *sharedIDs=[NSMutableSet set],*ids=[NSMutableSet set];if(shared){if(!references||![shared isKindOfClass:NSArray.class]||[shared count]>DYSharedMaskLimit)return nil;for(NSDictionary *mask in shared){if(!DYValidToolMask(mask)||[ids containsObject:mask[@"id"]]||mask[@"sharedID"])return nil;[ids addObject:mask[@"id"]];if(!mask[@"stampSource"])[sharedIDs addObject:mask[@"id"]];}}
id removed=doc[@"removedBase"];if(removed){if(![removed isKindOfClass:NSArray.class]||[removed count]>DYToolTypes().count)return nil;NSMutableSet *unique=[NSMutableSet set];for(id type in removed){if(![type isKindOfClass:NSString.class]||![DYToolTypes()containsObject:type]||[unique containsObject:type]||[doc[@"baseMasks"][type]count])return nil;[unique addObject:type];}}
for(NSString *key in doc[@"baseMasks"]){if(![DYToolTypes()containsObject:key]||!validMasks(doc[@"baseMasks"][key],ids,sharedIDs,references))return nil;}
@@ -104,7 +131,7 @@ static NSData *DYValidatedToolData(NSDictionary *doc){
BOOL DYValidToolDocument(NSDictionary *doc){return DYValidatedToolData(doc)!=nil;}
@implementation DYToolDocument
+ (BOOL)supportsSecureCoding{return YES;}
- (instancetype)init{if((self=[super init]))_document=[DYEmptyTools()copy];return self;}
- (instancetype)init{if((self=[super init]))_document=[DYInitialToolDocument(nil)copy];return self;}
- (void)dealloc{[_document release];[super dealloc];}
- (void)setDocument:(NSDictionary *)d{NSData *b=DYValidatedToolData(d);if(!b)return;NSDictionary *immutable=[NSPropertyListSerialization propertyListWithData:b options:NSPropertyListImmutable format:NULL error:nil];[self setImmutableDocument:immutable];}
- (void)setImmutableDocument:(NSDictionary*)document{if(document==_document)return;[document retain];[_document release];_document=document;}
@@ -158,11 +185,160 @@ static NSDictionary *DYExpandSharedMasks(NSDictionary *doc,BOOL keepKeys){
for(NSString *type in doc[@"baseMasks"])base[type]=resolve([@"base:" stringByAppendingString:type]);out[@"baseMasks"]=base;NSMutableArray *layers=[NSMutableArray array];for(NSDictionary *node in doc[@"layers"]){NSMutableDictionary *copy=[[node mutableCopy]autorelease];copy[@"masks"]=resolve(node[@"id"]);[layers addObject:copy];}out[@"layers"]=layers;out[@"schema"]=@2;[out removeObjectForKey:@"sharedMasks"];return out;
}
NSDictionary *DYResolvedToolDocument(NSDictionary *doc){return DYExpandSharedMasks(doc,NO);}
DYMaskParameters DYMaskAtTime(NSDictionary *mask,CMTime time){DYMaskParameters p=dyDefaultMaskParameters();readParameters(mask[@"parameters"],&p);NSArray *keys=mask[@"keys"];if(!keys.count||!CMTIME_IS_NUMERIC(time))return p;if(keyTime(keys[0]).epoch!=time.epoch)return p;NSUInteger low=0,high=keys.count;while(low<high){NSUInteger mid=low+(high-low)/2;if(CMTimeCompare(keyTime(keys[mid]),time)<0)low=mid+1;else high=mid;}NSDictionary *left=keys[low?low-1:0],*right=keys[MIN(low,keys.count-1)];DYMaskParameters a,b;readParameters(left[@"parameters"],&a);readParameters(right[@"parameters"],&b);double duration=CMTimeGetSeconds(CMTimeSubtract(keyTime(right),keyTime(left)));float w=duration>0?fmax(0,fmin(1,CMTimeGetSeconds(CMTimeSubtract(time,keyTime(left)))/duration)):0;
// Only temporal geometry/feather/strength interpolate; key selection and levels stay authored.
float *v=&p.centerX,*av=&a.centerX,*bv=&b.centerX;for(int i=0;i<8;i++)v[i]=av[i]+(bv[i]-av[i])*w;return p;}
struct DYMaskKeySpan {
NSDictionary *left=nil,*right=nil;
float fraction=0;
};
static DYMaskKeySpan maskKeySpan(NSDictionary *mask,CMTime time){
NSArray *keys=mask[@"keys"];
if(!keys.count||!CMTIME_IS_NUMERIC(time)||keyTime(keys[0]).epoch!=time.epoch)return {};
NSUInteger low=0,high=keys.count;
while(low<high){
NSUInteger mid=low+(high-low)/2;
if(CMTimeCompare(keyTime(keys[mid]),time)<0)low=mid+1;
else high=mid;
}
NSDictionary *left=keys[low?low-1:0],*right=keys[MIN(low,keys.count-1)];
double duration=CMTimeGetSeconds(CMTimeSubtract(keyTime(right),keyTime(left)));
float fraction=duration>0?std::clamp(CMTimeGetSeconds(CMTimeSubtract(time,keyTime(left)))/duration,0.,1.):0;
return {left,right,fraction};
}
static DYStampMotion stampMotionFromKey(NSDictionary *key){
NSArray *v=key[@"stampMotion"];
if(!v)return {};
return {[v[0] floatValue],[v[1] floatValue],[v[2] floatValue],
[v[3] floatValue],[v[4] floatValue],[v[5] floatValue],true};
}
static DYStampMotion stampMotionInSpan(DYMaskKeySpan span){
auto a=stampMotionFromKey(span.left),b=stampMotionFromKey(span.right);
if(span.fraction<=0)return a;
if(span.fraction>=1)return b;
auto blend=[&](float x,float y){return x+(y-x)*span.fraction;};
return {blend(a.sourceOffsetX,b.sourceOffsetX),blend(a.sourceOffsetY,b.sourceOffsetY),
blend(a.sourceScaleX,b.sourceScaleX),blend(a.sourceScaleY,b.sourceScaleY),
blend(a.targetScaleX,b.targetScaleX),blend(a.targetScaleY,b.targetScaleY),a.active||b.active};
}
DYStampMotion DYStampMotionAtTime(NSDictionary *stamp,CMTime time){return stampMotionInSpan(maskKeySpan(stamp,time));}
NSArray *DYStampSourceAtTime(NSDictionary *stamp,CMTime time){
NSArray *source=stamp[@"stampSource"];
DYStampMotion motion=DYStampMotionAtTime(stamp,time);
if(!source||!motion.active)return source;
return @[@(std::clamp([source[0] doubleValue]+motion.sourceOffsetX,0.,1.)),
@(std::clamp([source[1] doubleValue]+motion.sourceOffsetY,0.,1.)),source[2],source[3]];
}
NSArray *DYStampSamplingScaleAtTime(NSDictionary *stamp,CMTime time){
NSArray *base=stamp[@"stampSamplingScale"];
DYStampMotion motion=DYStampMotionAtTime(stamp,time);
if(!motion.active)return base;
double x=(base?[base[0] doubleValue]:1)*motion.sourceScaleX/motion.targetScaleX;
double y=(base?[base[1] doubleValue]:1)*motion.sourceScaleY/motion.targetScaleY;
return @[@(std::clamp(x,1./256,256.)),@(std::clamp(y,1./256,256.))];
}
DYMaskParameters DYMaskAtTime(NSDictionary *mask,CMTime time){
DYMaskParameters p=dyDefaultMaskParameters();
readParameters(mask[@"parameters"],&p);
BOOL stamp=mask[@"stampSource"]!=nil;
if(stamp)p.angle=0;
DYMaskKeySpan span=maskKeySpan(mask,time);
if(!span.left)return p;
DYMaskParameters a,b;
readParameters(span.left[@"parameters"],&a);readParameters(span.right[@"parameters"],&b);
float *v=&p.centerX,*av=&a.centerX,*bv=&b.centerX;
for(int i=0;i<(stamp?2:8);i++)v[i]=av[i]+(bv[i]-av[i])*span.fraction;
if(stamp){
DYStampMotion motion=stampMotionInSpan(span);
if(motion.active){
p.width=std::clamp(p.width*motion.targetScaleX,.001f,4000.f);
p.height=std::clamp(p.height*motion.targetScaleY,.001f,4000.f);
}
}
return p;
}
NSDictionary *DYMaskKey(CMTime t,DYMaskParameters p,BOOL manual,float confidence){return @{@"value":@(t.value),@"scale":@(t.timescale),@"epoch":@(t.epoch),@"parameters":parameterData(p),@"manual":@(manual),@"confidence":@(confidence)};}
BOOL DYMergeTracking(NSMutableDictionary *m,NSArray *samples){if(!samples.count)return YES;NSMutableArray *all=[NSMutableArray array];CMTime lo=keyTime(samples.firstObject),hi=keyTime(samples.lastObject);if(CMTimeCompare(lo,hi)>0)std::swap(lo,hi);for(NSDictionary *key in m[@"keys"])if([key[@"manual"]boolValue]||CMTimeCompare(keyTime(key),lo)<0||CMTimeCompare(keyTime(key),hi)>0)[all addObject:key];for(NSDictionary *key in samples){BOOL manual=NO;for(NSDictionary *old in all)if(CMTimeCompare(keyTime(old),keyTime(key))==0){manual=YES;break;}if(!manual)[all addObject:key];}[all sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){return (NSComparisonResult)CMTimeCompare(keyTime(a),keyTime(b));}];NSMutableDictionary *candidate=DYMutablePlist(m);candidate[@"keys"]=all;if(!DYValidToolMask(candidate))return NO;m[@"keys"]=all;return YES;}
NSDictionary *DYStampKey(CMTime time,DYMaskParameters p,BOOL manual,float confidence,DYStampMotion motion){
NSDictionary *key=DYMaskKey(time,p,manual,confidence);
if(!motion.active)return key;
NSMutableDictionary *paired=[[key mutableCopy]autorelease];
paired[@"stampMotion"]=@[@(motion.sourceOffsetX),@(motion.sourceOffsetY),@(motion.sourceScaleX),
@(motion.sourceScaleY),@(motion.targetScaleX),@(motion.targetScaleY)];
return paired;
}
// Analysis supplies a contiguous pass in either time direction. A symmetric
// kernel has no phase lag, and shrinking it at the ends keeps the seed and
// the last trusted frame fixed. Work in log scale so zoom in/out is symmetric.
static NSArray *smoothStampTrackingSamples(NSArray *samples){
if(samples.count<3)return samples;
for(NSDictionary *key in samples)
if(!key[@"stampMotion"]||[key[@"manual"]boolValue])return samples;
NSMutableArray *result=[NSMutableArray arrayWithCapacity:samples.count];
[result addObject:samples.firstObject];
for(NSUInteger i=1;i+1<samples.count;i++){
NSUInteger radius=std::min<NSUInteger>(2,std::min(i,samples.count-1-i));
const double weights[]={1,4,6,4,1};
const double endWeights[]={1,2,1};
double values[8]={};
for(NSUInteger j=0;j<=2*radius;j++){
NSDictionary *neighbor=samples[i-radius+j];
DYMaskParameters p;
if(!readParameters(neighbor[@"parameters"],&p))return samples;
auto m=stampMotionFromKey(neighbor);
double weight=radius==2?weights[j]/16:endWeights[j]/4;
const double components[]={p.centerX,p.centerY,m.sourceOffsetX,m.sourceOffsetY,
std::log(m.sourceScaleX),std::log(m.sourceScaleY),std::log(m.targetScaleX),std::log(m.targetScaleY)};
for(int k=0;k<8;k++)values[k]+=weight*components[k];
}
NSDictionary *original=samples[i];
DYMaskParameters p;
if(!readParameters(original[@"parameters"],&p))return samples;
p.centerX=values[0];p.centerY=values[1];
auto scale=[&](int index){return float(std::clamp(std::exp(values[index]),1./16,16.));};
DYStampMotion m={float(values[2]),float(values[3]),scale(4),scale(5),scale(6),scale(7),true};
[result addObject:DYStampKey(keyTime(original),p,NO,[original[@"confidence"]floatValue],m)];
}
[result addObject:samples.lastObject];
return result;
}
BOOL DYMergeTracking(NSMutableDictionary *m,NSArray *samples,CMTime frameDuration){
if(!samples.count)return YES;
NSMutableArray *all=[NSMutableArray array];
NSMutableDictionary *manualByTime=[NSMutableDictionary dictionary];
CMTime lo=keyTime(samples.firstObject),hi=keyTime(samples.lastObject);
if(CMTimeCompare(lo,hi)>0)std::swap(lo,hi);
if(m[@"stampSource"]&&CMTIME_IS_NUMERIC(frameDuration)&&frameDuration.value>0){
samples=smoothStampTrackingSamples(samples);
// FCP can shift analysis timestamps by a fraction of a frame between passes.
// Replace an older automatic key belonging to the first or last new frame.
CMTime half=CMTimeMultiplyByRatio(frameDuration,1,2);
lo=CMTimeSubtract(lo,half);hi=CMTimeAdd(hi,half);
}
// Normalize equivalent time fractions when preserving authored keys.
auto timeID=[](NSDictionary *key){
CMTime time=keyTime(key);
int64_t divisor=time.timescale>0?std::gcd(time.value%time.timescale,int64_t(time.timescale)):1;
return [NSString stringWithFormat:@"%lld/%lld/%lld",time.value/divisor,time.timescale/divisor,time.epoch];
};
for(NSDictionary *key in m[@"keys"]){
if([key[@"manual"] boolValue]){manualByTime[timeID(key)]=@(all.count);[all addObject:key];}
else if(CMTimeCompare(keyTime(key),lo)<0||CMTimeCompare(keyTime(key),hi)>0)[all addObject:key];
}
for(NSDictionary *key in samples){
NSNumber *index=manualByTime[timeID(key)];
if(!index){[all addObject:key];continue;}
if(key[@"stampMotion"]){
NSUInteger slot=index.unsignedIntegerValue;
NSMutableDictionary *authored=[[all[slot] mutableCopy]autorelease];
authored[@"stampMotion"]=key[@"stampMotion"];
all[slot]=authored;
}
}
[all sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){return (NSComparisonResult)CMTimeCompare(keyTime(a),keyTime(b));}];
NSMutableDictionary *candidate=[[m mutableCopy]autorelease];
candidate[@"keys"]=all;
if(!DYValidToolMask(candidate))return NO;
m[@"keys"]=all;
return YES;
}
NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){
NSArray *shared=DYSharedMasks(doc);
doc=DYExpandSharedMasks(doc,YES);
@@ -170,7 +346,12 @@ NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){
NSMutableArray *result=[NSMutableArray arrayWithCapacity:masks.count];
for(NSDictionary *mask in masks){
if(![mask[@"keys"]count]){[result addObject:mask];continue;}
NSMutableDictionary *m=[[mask mutableCopy]autorelease];m[@"parameters"]=parameterData(DYMaskAtTime(mask,t));m[@"keys"]=@[];[result addObject:m];
NSMutableDictionary *m=[[mask mutableCopy]autorelease];m[@"parameters"]=parameterData(DYMaskAtTime(mask,t));m[@"keys"]=@[];
if(mask[@"stampSource"]){
m[@"stampSource"]=DYStampSourceAtTime(mask,t);
m[@"stampSamplingScale"]=DYStampSamplingScaleAtTime(mask,t)?:@[@1,@1];
}
[result addObject:m];
}
return result;
};
@@ -7,13 +7,34 @@
auto timeAt=[](int frame){return CMTimeMake(frame*1001,24000);};auto capture=[&](int step){setFrame(step);host->_time=timeAt(step);NSData *state=nil;[plugin pluginState:&state atTime:host->_time quality:(FxQuality)0 error:&error];return [plugin renderDestinationImage:out sourceImages:@[frame] pluginState:state atTime:host->_time error:&error];};
auto request=[&](int direction){if(direction!=9)host->_state=kFxAnalysisState_NotAnalyzing;[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"base:hsl",@"mask":mask[@"id"],@"direction":@(direction)}]];};
auto drain=[&](){double end=NSProcessInfo.processInfo.systemUptime+.15;while(NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];};CMTimeRange inputRange=CMTimeRangeMake(kCMTimeZero,CMTimeMake(6*1001,24000)),desired;
NSMutableArray *updates=[NSMutableArray array];
id observer=[NSNotificationCenter.defaultCenter addObserverForName:@"DYToolTrackingStatus" object:host queue:nil usingBlock:^(NSNotification *note){if(note.userInfo[@"tracking"])[updates addObject:note.userInfo];}];
run.need(@"tracking-renders-valid-source-before-analysis",capture(0));run.record(@"inactive-tracking-avoids-full-frame-motion-readback",[[plugin valueForKey:@"toolCaptureDevices"]count]==0);int undoBefore=base->_undoStarts;request(1);BOOL callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&error]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&error];
for(int i=0;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&error];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];DYMaskParameters end=DYMaskAtTime(tracked,timeAt(5));run.record(@"host-callback-opencv-tracking-six-exact-frames",callbacks&&[tracked[@"keys"]count]==6&&fabs(end.centerX-(.5+10./tw))<.004&&fabs(end.centerY-(.5+5./th))<.004,@{@"keyCount":@([tracked[@"keys"]count]),@"centerX":@(end.centerX),@"centerY":@(end.centerY),@"error":reason(error)});
run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);BOOL captureFreed=YES;for(NSDictionary *entry in [[plugin valueForKey:@"toolCaptureDevices"]allValues])captureFreed&=!entry[@"encoded"]&&!entry[@"bytes"]&&!entry[@"buffer"];run.record(@"completed-tracking-releases-4k-gpu-analysis-working-images",captureFreed);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes);
NSDictionary *lastPreview=updates.count>=2?updates[updates.count-2]:nil;
DYMaskParameters shown{};
[lastPreview[@"shape"] getBytes:&shown length:sizeof(shown)];
NSData *previewPixels=lastPreview[@"rgba"];
run.record(@"mask-analysis-emits-matching-frame-geometry-and-completed-progress",
[lastPreview[@"completed"]intValue]==6&&[lastPreview[@"total"]intValue]==6&&
fabs([lastPreview[@"time"]doubleValue]-CMTimeGetSeconds(timeAt(5)))<1e-9&&
previewPixels.length==tw*th*4&&shown.centerX==end.centerX&&shown.centerY==end.centerY&&
!lastPreview[@"sourceShape"]&&![updates.lastObject[@"tracking"]boolValue]&&host->_seekCount==0);
run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);BOOL captureFreed=YES;for(NSDictionary *entry in [[plugin valueForKey:@"toolCaptureDevices"]allValues])captureFreed&=!entry[@"encoded"]&&!entry[@"bytes"]&&!entry[@"buffer"]&&!entry[@"previewBuffer"];run.record(@"completed-tracking-releases-4k-gpu-analysis-working-images",captureFreed);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes);
// Mid-analysis author edits must reject the result rather than clobber them.
capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}NSMutableDictionary *changed=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);changed[@"baseMasks"][@"hsl"][0][@"enabled"]=@NO;DYWriteTools(base,changed,kCMTimeZero);[plugin cleanupAnalysis:nil];drain();run.record(@"stale-analysis-cannot-overwrite-edited-mask",[DYReadTools(base,kCMTimeZero).document isEqual:changed]&&base->_undoStarts==writes);
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}request(9);setFrame(3);NSError *cancelError=nil;BOOL stopped=![plugin analyzeFrame:frame atTime:timeAt(3) error:&cancelError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"cancel-keeps-only-contiguous-trusted-segment",callbacks&&stopped&&[tracked[@"keys"]count]==3&&base->_undoStarts==writes+1);run.record(@"cancel-sends-sdk-quiet-analysis-termination",[cancelError.domain isEqual:FxPlugErrorDomain]&&cancelError.code==kFxError_UserCancelled);
[updates removeAllObjects];
DYWriteTools(base,doc,kCMTimeZero);capture(2);host->_state=kFxAnalysisState_NotAnalyzing;request(0);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();BOOL backward=host->_backwardStarts==1;callbacks&=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i>=0&&callbacks;i--){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"bidirectional-passes-share-reference-and-merge-once",callbacks&&backward&&[tracked[@"keys"]count]==6&&base->_undoStarts==writes+2);
NSUInteger previous=0;BOOL progress=YES,sawForward=NO,sawBackward=NO;
for(NSDictionary *update in updates){
if(!update[@"shape"])continue;
NSUInteger current=[update[@"completed"]unsignedIntegerValue];
progress&=current>=previous&&[update[@"total"]intValue]==6;
if([update[@"backward"]boolValue])sawBackward=YES;else sawForward=YES;
previous=current;
}
run.record(@"bidirectional-progress-counts-reference-once-and-never-regresses",progress&&sawForward&&sawBackward&&previous==6);
DYWriteTools(base,doc,kCMTimeZero);capture(2);host->_timelineOffset=CMTimeMake(4,1);host->_state=kFxAnalysisState_NotAnalyzing;request(-2);BOOL range=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&CMTimeCompare(desired.start,timeAt(1))==0&&CMTimeCompare(desired.duration,timeAt(2))==0;[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i>=1;i--){setFrame(i);[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}setFrame(0);NSError *singleStopError=nil;stopped=![plugin analyzeFrame:frame atTime:timeAt(0) error:&singleStopError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"backward-single-step-includes-reference-and-one-neighbor",range&&stopped&&[tracked[@"keys"]count]==2);run.record(@"single-step-sends-sdk-quiet-analysis-termination",[singleStopError.domain isEqual:FxPlugErrorDomain]&&singleStopError.code==kFxError_UserCancelled);
run.record(@"backward-single-step-seeks-timeline-with-clip-offset",host->_seekCount==1&&CMTimeCompare(host->_seekTime,CMTimeAdd(CMTimeMake(4,1),timeAt(1)))==0&&CMTimeCompare(host->_time,timeAt(1))==0);
DYWriteTools(base,doc,kCMTimeZero);capture(2);BOOL repeated=YES;for(int first=2;first<4;first++){request(2);repeated&=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=first;i<=first+1&&repeated;i++){setFrame(i);repeated&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();repeated&=CMTimeCompare(host->_time,timeAt(first+1))==0;}run.record(@"repeated-forward-single-step-continues-source-frames-at-offset-clip",repeated&&host->_seekCount==3&&CMTimeCompare(host->_seekTime,CMTimeAdd(CMTimeMake(4,1),timeAt(4)))==0);
@@ -66,5 +87,88 @@
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:host userInfo:@{@"node":@"shared",@"mask":sharedID,@"message":@"共享跟踪状态"}];BOOL statusVisible=[[[panel valueForKey:@"_status"]stringValue]isEqual:@"共享跟踪状态"];
run.record(@"shared-mask-inspector-alias-activates-canvas-and-receives-canonical-status",aliasActive&&statusVisible&&[[(NSObject*)plugin valueForKey:@"_selectedToolNode"]isEqual:@"shared"]);
}
{
NSMutableDictionary *stampDoc=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);
NSMutableDictionary *stamp=(id)DYAddSharedMask(stampDoc,DYMaskEllipse);
NSString *stampID=stamp[@"id"];
DYMaskParameters target=DYMaskAtTime(stamp,kCMTimeZero);
target.centerX=.75f;target.centerY=.5f;target.width=.32f;target.height=.54f;
stamp[@"parameters"]=[NSData dataWithBytes:&target length:sizeof(target)];
stamp[@"stampSource"]=@[@.25,@.5,@.32,@.54];
auto noise=[](int x,int y){
uint32_t n=uint32_t(x)*73856093u^uint32_t(y)*19349663u;
n^=n>>13;n*=1274126177u;
return .15f+.7f*((n>>8)&255)/255.f;
};
auto pairedFrame=[&](int step,bool flatSource){
Pixels pixels(tw*th*4);
for(NSUInteger y=0;y<th;y++)for(NSUInteger x=0;x<tw;x++){
bool source=x<tw/2;
float cx=tw*(source?.25f:.75f),cy=th*.5f,scale=1+step*(source?-.025f:.035f);
float u=(cx+(float(x)-cx-step*(source?-1.5f:2.f))/scale)/4;
float v=(cy+(float(y)-cy-step*(source?1.f:-.75f))/scale)/4;
int ix=int(floorf(u)),iy=int(floorf(v));float fx=u-ix,fy=v-iy;
float top=noise(ix,iy)*(1-fx)+noise(ix+1,iy)*fx;
float bottom=noise(ix,iy+1)*(1-fx)+noise(ix+1,iy+1)*fx;
float code=source&&flatSource?.4f:top*(1-fy)+bottom*fy;
float linear=powf((code+.055f)/1.055f,2.4f);
auto index=(y*tw+x)*4;pixels[index]=pixels[index+1]=pixels[index+2]=linear;pixels[index+3]=1;
}
[[frame metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,tw,th) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:tw*8];
};
auto requestStamp=[&](int start){
host->_time=timeAt(start);host->_state=kFxAnalysisState_NotAnalyzing;
[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"shared",@"mask":stampID,@"direction":@1}]];
return [plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&
[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
};
auto finish=[&](){host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();};
DYWriteTools(base,stampDoc,kCMTimeZero);
int beforeStamp=base->_undoStarts;
BOOL paired=requestStamp(0);
NSError *pairError=nil;
for(int i=0;i<6&&paired;i++){pairedFrame(i,false);paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&pairError];}
finish();
NSDictionary *saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
DYStampMotion motion=DYStampMotionAtTime(saved,timeAt(5));
DYMaskParameters covered=DYMaskAtTime(saved,timeAt(5));
NSArray *sampled=DYStampSourceAtTime(saved,timeAt(5));
lastPreview=updates.count>=2?updates[updates.count-2]:nil;
DYMaskParameters shownSource{},shownTarget{};
[lastPreview[@"sourceShape"] getBytes:&shownSource length:sizeof(shownSource)];
[lastPreview[@"shape"] getBytes:&shownTarget length:sizeof(shownTarget)];
run.record(@"clone-analysis-preview-displays-both-regions-on-the-same-frame",
[lastPreview[@"completed"]intValue]==6&&fabs([lastPreview[@"time"]doubleValue]-CMTimeGetSeconds(timeAt(5)))<1e-9&&
fabs(shownSource.centerX-[sampled[0]doubleValue])<1e-6&&shownTarget.centerX==covered.centerX&&
fabs(shownTarget.width-covered.width)<1e-6&&[lastPreview[@"rgba"]length]==tw*th*4);
run.record(@"host-clone-stamp-follows-two-independent-centers-and-scales",
paired&&[saved[@"keys"] count]==6&&motion.active&&
fabs(covered.centerX-(.75+10./tw))<.006&&fabs(covered.centerY-(.5-3.75/th))<.008&&
fabs([sampled[0] doubleValue]-(.25-7.5/tw))<.006&&fabs([sampled[1] doubleValue]-(.5+5./th))<.008&&
fabs(motion.targetScaleX-1.175)<.045&&fabs(motion.targetScaleY-1.175)<.045&&
fabs(motion.sourceScaleX-.875)<.04&&fabs(motion.sourceScaleY-.875)<.04&&base->_undoStarts==beforeStamp+1,
@{@"keys":@([saved[@"keys"] count]),@"source":sampled?:@[],@"target":@[@(covered.centerX),@(covered.centerY)],
@"sourceScale":@[@(motion.sourceScaleX),@(motion.sourceScaleY)],
@"targetScale":@[@(motion.targetScaleX),@(motion.targetScaleY)],@"error":reason(pairError)});
DYStampMotion restart=DYStampMotionAtTime(saved,timeAt(2));
paired=requestStamp(2);
for(int i=2;i<6&&paired;i++){pairedFrame(i,false);paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}
finish();
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
DYStampMotion resumed=DYStampMotionAtTime(saved,timeAt(2));
run.record(@"host-clone-stamp-restarts-from-current-paired-scale",
paired&&[saved[@"keys"] count]==6&&resumed.active&&restart.sourceScaleX==resumed.sourceScaleX&&restart.targetScaleX==resumed.targetScaleX);
DYWriteTools(base,stampDoc,kCMTimeZero);
paired=requestStamp(0);
for(int i=0;i<3&&paired;i++){pairedFrame(i,false);paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}
pairedFrame(3,true);NSError *sourceLoss=nil;
BOOL ended=![plugin analyzeFrame:frame atTime:timeAt(3) error:&sourceLoss];
finish();
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
run.record(@"host-clone-stamp-source-loss-stops-both-tracks-at-last-paired-frame",
paired&&ended&&[saved[@"keys"] count]==3&&[sourceLoss.domain isEqual:FxPlugErrorDomain]&&
sourceLoss.code==kFxError_UserCancelled&&[sourceLoss.localizedDescription containsString:@"取样区域"]);
}
[NSNotificationCenter.defaultCenter removeObserver:observer];
[plugin release];
}
+13
查看文件
@@ -58,3 +58,16 @@ kernel void dyToolCapture(texture2d<float> source [[texture(0)]],device float* p
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;
}
// Reuse the analysis source texture for the lightweight color preview.
kernel void dyToolTrackingPreview(texture2d<float> source [[texture(0)]],
device uchar4 *pixels [[buffer(0)]],
constant uint3 &info [[buffer(1)]],
uint2 pos [[thread_position_in_grid]]){
if(any(pos>=info.xy))return;
constexpr sampler filter(coord::normalized,address::clamp_to_edge,filter::linear);
float2 uv=(float2(pos)+.5f)/float2(info.xy);
if(info.z)uv.y=1-uv.y;
float3 rgb=source.sample(filter,uv).rgb;
pixels[pos.y*info.x+pos.x]=uchar4(uchar3(rint(saturate(rgb)*255)),255);
}
+167
查看文件
@@ -0,0 +1,167 @@
@interface DYTrackingPreviewImage : NSView
- (void)showFrame:(NSDictionary *)frame;
@end
@implementation DYTrackingPreviewImage {
NSDictionary *_frame;
NSImage *_image;
}
- (instancetype)initWithFrame:(NSRect)frame {
if((self=[super initWithFrame:frame]))self.clipsToBounds=YES;
return self;
}
- (BOOL)isFlipped {return YES;}
- (BOOL)isAccessibilityElement {return YES;}
- (NSString *)accessibilityRole {return NSAccessibilityImageRole;}
- (void)dealloc {[_frame release];[_image release];[super dealloc];}
- (void)showFrame:(NSDictionary *)frame {
[_frame release];_frame=[frame copy];[_image release];_image=nil;
NSData *pixels=frame[@"rgba"];
NSUInteger w=[frame[@"width"] unsignedIntegerValue],h=[frame[@"height"] unsignedIntegerValue];
if(w&&h&&pixels.length==w*h*4){
CGDataProviderRef provider=CGDataProviderCreateWithCFData((CFDataRef)pixels);
CGColorSpaceRef space=CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
CGImageRef cg=CGImageCreate(w,h,8,32,w*4,space,kCGImageAlphaNoneSkipLast,provider,nil,true,kCGRenderingIntentDefault);
if(cg){_image=[[NSImage alloc]initWithCGImage:cg size:NSMakeSize(w,h)];CGImageRelease(cg);}
CGColorSpaceRelease(space);CGDataProviderRelease(provider);
}
self.accessibilityLabel=_image?[NSString stringWithFormat:@"同步预览 · 源帧 %.3f 秒 · %@",[frame[@"time"] doubleValue],
frame[@"sourceShape"]?@"取样与覆盖区域":@"蒙版轮廓"]:@"等待源帧";
[self setNeedsDisplay:YES];
}
- (void)drawShape:(NSData *)shape nodes:(NSData *)nodes inRect:(NSRect)rect source:(BOOL)source {
if(shape.length!=sizeof(DYMaskParameters))return;
DYMaskParameters p;[shape getBytes:&p length:sizeof(p)];
double aspect=rect.size.width/rect.size.height,c=cos(p.angle),s=sin(p.angle);
auto point=[&](double x,double y){
double px=x*p.width*aspect,py=y*p.height;
return NSMakePoint(rect.origin.x+(p.centerX+(px*c-py*s)/aspect)*rect.size.width,
rect.origin.y+(p.centerY+px*s+py*c)*rect.size.height);
};
NSBezierPath *path=[NSBezierPath bezierPath];
auto add=[&](NSPoint position,int i){if(i)[path lineToPoint:position];else [path moveToPoint:position];};
if(p.kind==DYMaskBezier){
auto contour=dyFlattenMask((const DYBezierNode *)nodes.bytes,nodes.length/sizeof(DYBezierNode));
for(int i=0;i<contour.count;i++)add(point(contour.x[i],contour.y[i]),i);
}else if(p.kind==DYMaskRectangle){
const double corners[][2]={{-.5,-.5},{.5,-.5},{.5,.5},{-.5,.5}};
for(int i=0;i<4;i++)add(point(corners[i][0],corners[i][1]),i);
}else{
for(int i=0;i<80;i++){double a=i*2*M_PI/80;add(point(.5*cos(a),.5*sin(a)),i);}
}
[path closePath];path.lineWidth=3.5;[NSColor.blackColor setStroke];[path stroke];
if(source){CGFloat dashes[]={4,3};[path setLineDash:dashes count:2 phase:0];}
[(source?NSColor.systemCyanColor:NSColor.systemYellowColor) setStroke];path.lineWidth=1.6;[path stroke];
}
- (void)drawRect:(NSRect)dirty {
[NSColor.blackColor setFill];NSRectFill(NSIntersectionRect(dirty,self.bounds));
if(!_image||NSIsEmptyRect(self.bounds))return;
double aspect=[_frame[@"aspect"] doubleValue];
if(!std::isfinite(aspect)||aspect<=0)aspect=_image.size.width/_image.size.height;
CGFloat w=MIN(NSWidth(self.bounds),NSHeight(self.bounds)*aspect),h=w/aspect;
NSRect picture=NSMakeRect(NSMidX(self.bounds)-w/2,NSMidY(self.bounds)-h/2,w,h);
[NSGraphicsContext saveGraphicsState];
NSRectClip(picture);
if([_frame[@"flip"] boolValue]){
[NSGraphicsContext saveGraphicsState];
NSAffineTransform *flip=[NSAffineTransform transform];[flip translateXBy:0 yBy:2*NSMidY(picture)];[flip scaleXBy:1 yBy:-1];[flip concat];
}
[_image drawInRect:picture fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
if([_frame[@"flip"] boolValue])[NSGraphicsContext restoreGraphicsState];
[self drawShape:_frame[@"shape"] nodes:_frame[@"nodes"] inRect:picture source:NO];
[self drawShape:_frame[@"sourceShape"] nodes:nil inRect:picture source:YES];
[NSGraphicsContext restoreGraphicsState];
}
@end
@interface DYTrackingProgressBar : NSView
@property(nonatomic) double doubleValue;
@end
@implementation DYTrackingProgressBar
- (BOOL)isAccessibilityElement {return YES;}
- (NSString *)accessibilityRole {return NSAccessibilityProgressIndicatorRole;}
- (id)accessibilityValue {return @(_doubleValue);}
- (id)accessibilityMinValue {return @0;}
- (id)accessibilityMaxValue {return @1;}
- (void)setDoubleValue:(double)value {
_doubleValue=std::clamp(value,0.,1.);
[self setNeedsDisplay:YES];
}
- (void)drawRect:(NSRect)dirty {
NSRect rail=NSInsetRect(self.bounds,0,2);
CGFloat radius=NSHeight(rail)/2;
NSBezierPath *track=[NSBezierPath bezierPathWithRoundedRect:rail xRadius:radius yRadius:radius];
[[[NSColor labelColor] colorWithAlphaComponent:.18] setFill];
[track fill];
if(_doubleValue<=0)return;
[NSGraphicsContext saveGraphicsState];[track addClip];
NSRect fill=rail;fill.size.width*=_doubleValue;
[NSColor.controlAccentColor setFill];NSRectFill(fill);
[NSGraphicsContext restoreGraphicsState];
}
@end
@interface DYTrackingPreview : NSView
- (instancetype)initWithTarget:(id)target action:(SEL)action;
- (void)applyUpdate:(NSDictionary *)info;
- (void)reset;
@property(nonatomic,readonly) BOOL running;
@property(nonatomic,readonly) NSString *maskID;
@end
@implementation DYTrackingPreview {
DYTrackingPreviewImage *_preview;
NSTextField *_title,*_detail,*_status;
NSButton *_action;
DYTrackingProgressBar *_progress;
NSString *_maskID;
BOOL _running;
}
- (BOOL)isFlipped {return YES;}
- (BOOL)running {return _running;}
- (NSString *)maskID {return _maskID;}
- (void)dealloc {[_maskID release];[super dealloc];}
- (instancetype)initWithTarget:(id)target action:(SEL)action {
if((self=[super initWithFrame:NSZeroRect])){
self.identifier=@"DYTrackingPreview";
_title=[DYThemeLabel labelWithString:@"跟踪预览"];_title.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];
_detail=[DYThemeLabel labelWithString:@""];_detail.font=[NSFont monospacedDigitSystemFontOfSize:10 weight:NSFontWeightRegular];
_status=[DYThemeLabel labelWithString:@""];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=2;_status.lineBreakMode=NSLineBreakByWordWrapping;
_action=DYWorkspaceButton(@"停止跟踪",target,action);
_progress=[[[DYTrackingProgressBar alloc]init]autorelease];_progress.accessibilityLabel=@"跟踪进度";
_preview=[[[DYTrackingPreviewImage alloc]init]autorelease];[_preview showFrame:nil];
for(NSView *view in @[_title,_detail,_status,_action,_progress,_preview])[self addSubview:view];
self.hidden=YES;
}
return self;
}
- (void)layout {
[super layout];
CGFloat w=NSWidth(self.bounds),h=NSHeight(self.bounds),body=MAX(1,w-16);
_title.frame=NSMakeRect(8,6,MAX(1,w-108),18);
_action.frame=NSMakeRect(MAX(0,w-98),2,92,24);
_progress.frame=NSMakeRect(8,28,body,10);
_status.frame=NSMakeRect(8,43,body,32);
_preview.frame=NSMakeRect(8,80,body,MAX(1,h-106));
_detail.frame=NSMakeRect(8,MAX(80,h-22),body,18);
}
- (void)applyUpdate:(NSDictionary *)info {
if(![_maskID isEqual:info[@"mask"]]){[_maskID release];_maskID=[info[@"mask"]copy];}
BOOL active=[info[@"tracking"] boolValue];
if(active&&!info[@"shape"]){[_preview showFrame:nil];_detail.stringValue=@"";_title.stringValue=@"跟踪预览";}
if(info[@"shape"]){
BOOL stamp=info[@"sourceShape"]!=nil;
_title.stringValue=stamp?@"图章跟踪预览":@"蒙版跟踪预览";
[_preview showFrame:info];
_detail.stringValue=[NSString stringWithFormat:@"%.3fs %@",[info[@"time"] doubleValue],stamp?@"青色取样 · 黄色覆盖":@"黄色轮廓"];
}
NSUInteger total=[info[@"total"] unsignedIntegerValue];
if(active)_progress.doubleValue=total?[info[@"completed"] doubleValue]/total:0;
_running=active;_action.title=active?@"停止跟踪":@"返回示波器";_action.accessibilityLabel=_action.title;
_status.stringValue=info[@"message"]?:@"";_status.toolTip=_status.stringValue;
}
- (void)reset {
_progress.doubleValue=0;[_preview showFrame:nil];[_maskID release];_maskID=nil;_running=NO;self.hidden=YES;
}
@end
+27 -7
查看文件
@@ -20,6 +20,14 @@ static void DYDrawDistortionGrid(NSRect rect,NSColor *color){
}
[color setStroke];[grid stroke];
}
static void DYDrawLevel(NSRect rect,NSColor *ink){
CGFloat size=NSWidth(rect),x=NSMinX(rect),y=NSMinY(rect);
NSBezierPath *guide=[NSBezierPath bezierPath];
[guide moveToPoint:NSMakePoint(x+size*.12,y+size*.75)];[guide lineToPoint:NSMakePoint(x+size*.88,y+size*.75)];
[guide moveToPoint:NSMakePoint(x+size*.19,y+size*.56)];[guide lineToPoint:NSMakePoint(x+size*.81,y+size*.22)];
guide.lineWidth=MAX(1.,size*.085);guide.lineCapStyle=NSLineCapStyleRound;
[ink setStroke];[guide stroke];
}
static void DYDrawCloneStamp(NSRect rect,NSColor *color){
CGFloat side=NSWidth(rect),x=NSMinX(rect),y=NSMinY(rect);
NSBezierPath *handle=[NSBezierPath bezierPathWithRoundedRect:NSMakeRect(x+side*.31,y+side*.05,side*.38,side*.43) xRadius:side*.16 yRadius:side*.16];
@@ -43,6 +51,8 @@ static void DYDrawCloneStamp(NSRect rect,NSColor *color){
- (void)draw;
- (NSRect)drawingBounds;
@property(nonatomic) BOOL stampArmed;
@property(nonatomic) NSInteger levelMode; // 0 closed, 1 horizontal, 2 vertical
@property(nonatomic) BOOL levelResetRequested;
- (NSInteger)partAtPoint:(NSPoint)point;
- (BOOL)event:(NSEventType)type point:(NSPoint)point atTime:(CMTime)time;
- (BOOL)mouseMoved:(NSPoint)point;
@@ -58,7 +68,7 @@ static void DYDrawCloneStamp(NSRect rect,NSColor *color){
@synthesize bridge=_bridge;
- (instancetype)init{if((self=[super init])){_panels=[NSMutableArray new];_areas=[NSMutableArray new];_scale=1;_time=kCMTimeInvalid;}return self;}
- (void)dealloc{[self finishCapture];[_bridge release];[_panels release];[_areas release];[super dealloc];}
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];for(DYViewerParameterPanel*p in _panels)p.bridge=nil;[_panels removeAllObjects];[_bridge release];_bridge=[bridge retain];_pendingSkinPreview=NO;_stampArmed=NO;}
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];for(DYViewerParameterPanel*p in _panels)p.bridge=nil;[_panels removeAllObjects];[_bridge release];_bridge=[bridge retain];_pendingSkinPreview=NO;_stampArmed=NO;_levelMode=0;_levelResetRequested=NO;}
- (void)setViewport:(NSRect)viewport{_viewport=viewport;_hasViewport=YES;}
- (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time{
_size=size;_time=time;_backingScale=scale;
@@ -69,10 +79,17 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
if(_capture&&![_capture capturing])_capture=nil;
[_areas removeAllObjects];if(!_bridge||v.size.width<100||v.size.height<80)return;
// Only tools that benefit from direct image interaction belong on the canvas.
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper",@"clone-stamp"];
CGFloat railScale=MIN(s,v.size.width/480.),y=NSMaxY(v)-33*railScale,w=36*railScale;
CGFloat x=NSMaxX(v)-476*railScale;
_rail=NSMakeRect(x,y,356*railScale,25*railScale);
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章",@"水平校正"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper",@"clone-stamp",@"level"];
CGFloat railScale=MIN(s,v.size.width/520.),y=NSMaxY(v)-33*railScale,w=36*railScale;
CGFloat x=NSMaxX(v)-516*railScale;
_rail=NSMakeRect(x,y,396*railScale,25*railScale);
if(_levelMode){
NSArray *labels=@[@"水平",@"垂直",@"重置"];
for(NSInteger i=0;i<3;i++){
NSRect r=NSMakeRect(NSMaxX(v)-(276-56*i)*railScale,y-34*railScale,52*railScale,26*railScale);
[_areas addObject:@{@"part":@(20031+i),@"kind":@"levelOption",@"index":@(i+1),@"title":labels[i],@"rect":[NSValue valueWithRect:r]}];
}
}
for(NSInteger i=0;i<3;i++)[_areas addObject:@{@"part":@(20010+i),@"kind":@"mask",@"index":@([@[@1,@0,@2][i]integerValue]),@"title":@[@"矩形",@"椭圆",@"钢笔"][i],@"symbol":@[@"rectangle",@"circle",@"pencil.tip"][i],@"rect":[NSValue valueWithRect:NSMakeRect(x+i*40*railScale,y,w,25*railScale)]}];
for(NSInteger i=0;i<types.count;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"symbol":symbols[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+(i+3)*40*railScale,y,w,25*railScale)]}];
CGFloat buttonWidth=100*railScale,buttonHeight=27*railScale;
@@ -112,7 +129,7 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
}
- (void)draw{
if(!_areas.count)return;[NSGraphicsContext saveGraphicsState];NSRectClip(_viewport);CGFloat s=_scale;for(DYViewerParameterPanel*p in _panels)[p draw];
for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=([a[@"toolType"]isEqual:@"skin"]&&[self skinPreviewEnabled])||([a[@"toolType"]isEqual:@"cloneStamp"]&&_stampArmed);for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES;
for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=([a[@"toolType"]isEqual:@"skin"]&&[self skinPreviewEnabled])||([a[@"toolType"]isEqual:@"cloneStamp"]&&_stampArmed)||([a[@"toolType"]isEqual:@"level"]&&_levelMode)||([a[@"kind"]isEqual:@"levelOption"]&&[a[@"index"]integerValue]==_levelMode);for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES;
BOOL hover=_hover==[a[@"part"]integerValue];
BOOL pressed=_pressed==[a[@"part"]integerValue];DYDrawSoftControl(r,4*s,NO,selected||hover,pressed);
if(a[@"symbol"]){
@@ -121,6 +138,7 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
NSRect glyph=NSMakeRect(NSMidX(r)-side/2,NSMidY(r)-side/2,side,side);
if([a[@"symbol"]isEqual:@"pincushion-grid"])DYDrawDistortionGrid(NSInsetRect(glyph,1,1),ink);
else if([a[@"symbol"]isEqual:@"clone-stamp"])DYDrawCloneStamp(glyph,ink);
else if([a[@"symbol"]isEqual:@"level"])DYDrawLevel(glyph,ink);
else{
NSImage *icon=[NSImage imageWithSystemSymbolName:a[@"symbol"] accessibilityDescription:a[@"title"]];
NSImageSymbolConfiguration *configuration=[[NSImageSymbolConfiguration configurationWithPointSize:14*s weight:NSFontWeightRegular]configurationByApplyingConfiguration:[NSImageSymbolConfiguration configurationWithPaletteColors:@[ink]]];
@@ -139,6 +157,8 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
[NSGraphicsContext restoreGraphicsState];
}
- (void)activateTool:(NSString*)type{
if([type isEqual:@"level"]){_stampArmed=NO;_levelMode=_levelMode?0:1;return;}
_levelMode=0;
if([type isEqual:@"cloneStamp"]){_stampArmed=!_stampArmed;return;}
_stampArmed=NO;
if([type isEqual:@"look"]){[_bridge requestWorkspacePage:@"lut"];return;}
@@ -157,7 +177,7 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
if(!hit)return NO;_pressed=hit;return YES;
}
if(!_pressed)return NO;
if(type==NSEventTypeLeftMouseUp){NSInteger pressed=_pressed;_pressed=0;if(hit==pressed){for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==hit){NSString*kind=a[@"kind"];if([kind isEqual:@"tool"])[self activateTool:a[@"toolType"]];else if([kind isEqual:@"mask"]){_stampArmed=NO;[_bridge requestMask:[a[@"index"]integerValue]];}else if([kind isEqual:@"workspace"])[_bridge requestWorkspace];else if([kind isEqual:@"hidePanels"]){for(DYViewerParameterPanel*panel in _panels){[panel finishCapture];panel.bridge=nil;}[_panels removeAllObjects];}else if([kind isEqual:@"railPage"])_railPage++;break;}}[self prepareWithSize:_size scale:_backingScale atTime:time];}
if(type==NSEventTypeLeftMouseUp){NSInteger pressed=_pressed;_pressed=0;if(hit==pressed){for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==hit){NSString*kind=a[@"kind"];if([kind isEqual:@"tool"])[self activateTool:a[@"toolType"]];else if([kind isEqual:@"levelOption"]){NSInteger choice=[a[@"index"]integerValue];if(choice==3)_levelResetRequested=YES;else _levelMode=choice;}else if([kind isEqual:@"mask"]){_stampArmed=NO;_levelMode=0;[_bridge requestMask:[a[@"index"]integerValue]];}else if([kind isEqual:@"workspace"]){_levelMode=0;[_bridge requestWorkspace];}else if([kind isEqual:@"hidePanels"]){for(DYViewerParameterPanel*panel in _panels){[panel finishCapture];panel.bridge=nil;}[_panels removeAllObjects];}else if([kind isEqual:@"railPage"])_railPage++;break;}}[self prepareWithSize:_size scale:_backingScale atTime:time];}
return YES;
}
- (BOOL)capturing{return _pressed||[_capture capturing];}
@@ -12,7 +12,7 @@
publish();int undo=base->_undoStarts;NSDictionary *initial=[[base->_values copy]autorelease];
NSMutableSet *types=[NSMutableSet set];NSInteger masks=0;CGFloat lastX=-1,y=-1;BOOL horizontal=YES;
for(NSDictionary *a in [controls valueForKey:@"areas"]){if([a[@"kind"]isEqual:@"mask"])masks++;if([a[@"kind"]isEqual:@"tool"]){NSRect r=[a[@"rect"]rectValue];if(lastX>=0)horizontal&=r.origin.x>lastX&&r.origin.y==y;lastX=r.origin.x;y=r.origin.y;[types addObject:a[@"toolType"]];}}
run.record(@"viewer-lower-right-rail-has-six-image-tools-and-three-persistent-mask-shapes",horizontal&&lastX>size.width*.8&&y>size.height*.9&&[types isEqual:[NSSet setWithArray:@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0);
run.record(@"viewer-lower-right-rail-has-seven-image-tools-and-three-persistent-mask-shapes",horizontal&&lastX>size.width*.8&&y>size.height*.9&&[types isEqual:[NSSet setWithArray:@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0);
NSDictionary *stamp=areaFor(controls,@"tool",@"cloneStamp");
click(stamp);BOOL armed=controls.stampArmed;click(stamp);
run.record(@"viewer-stamp-arms-and-disarms-without-changing-the-grade",armed&&!controls.stampArmed&&[initial isEqual:base->_values]&&base->_undoStarts==undo);
@@ -29,6 +29,30 @@
[host->_parent setFrameSize:NSMakeSize(840,300)];run.record(@"workspace-follows-remote-container-resize",NSEqualRects(root.frame,host->_parent.bounds));
headerBitmap=DYWorkspaceHeaderBitmap(root);toolbarInk=DYWorkspaceHeaderInk(headerBitmap,root,toolbar);closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton);
run.record(@"workspace-topbar-survives-minimum-resize-and-large-dirty-redraw",toolbarInk>80&&closeInk>10&&DYWorkspaceLargeDirtyPreservesHeader(headerBitmap,root,scopePane),@{@"toolbarPixels":@(toolbarInk),@"closePixels":@(closeInk)});
NSNotificationCenter *trackingCenter=NSNotificationCenter.defaultCenter;
DYMaskParameters trackedShape=dyDefaultMaskParameters();
NSData *shapeBytes=[NSData dataWithBytes:&trackedShape length:sizeof(trackedShape)];
[trackingCenter postNotificationName:@"DYToolTrackingStatus" object:host
userInfo:@{@"tracking":@YES,@"message":@"正向 · 3 / 6 帧 · 50%",@"shape":shapeBytes,
@"rgba":[NSData dataWithBytes:"\xff\x00\x00\xff" length:4],@"width":@1,@"height":@1,
@"time":@.08,@"aspect":@1,@"total":@6,@"completed":@3}];
NSView *trackingPreview=[workspace valueForKey:@"trackingPreview"];
NSView *progress=[trackingPreview valueForKey:@"progress"];
NSView *image=[trackingPreview valueForKey:@"preview"];
NSButton *previewAction=[trackingPreview valueForKey:@"action"];
[trackingPreview layoutSubtreeIfNeeded];
run.record(@"workspace-tracking-preview-replaces-scopes-with-readable-progress-and-image",
!trackingPreview.hidden&&[(NSView *)plots.firstObject isHidden]&&[progress.accessibilityValue doubleValue]==.5&&
[image.accessibilityLabel containsString:@"0.080"]&&image.clipsToBounds&&NSWidth(image.frame)>200&&NSHeight(image.frame)>120);
__block BOOL cancelRouted=NO;
id stopObserver=[trackingCenter addObserverForName:@"DYToolTrack" object:host queue:nil usingBlock:^(NSNotification *n){cancelRouted=[n.userInfo[@"direction"]intValue]==9;}];
[previewAction performClick:nil];
[trackingCenter removeObserver:stopObserver];
[trackingCenter postNotificationName:@"DYToolTrackingStatus" object:host userInfo:@{@"tracking":@NO,@"message":@"已取消;保留最后连续可信轨迹"}];
BOOL resultRetained=!trackingPreview.hidden&&[image.accessibilityLabel containsString:@"0.080"]&&[previewAction.title isEqual:@"返回示波器"];
[previewAction performClick:nil];
run.record(@"workspace-preview-stop-routes-to-analysis-and-dismiss-restores-scopes",
cancelRouted&&resultRetained&&trackingPreview.hidden&&![(NSView *)plots.firstObject isHidden]);
[workspace showRelativeToView:nil];workspaceDrain();run.record(@"workspace-reopens-existing-host-remote-window",host->_requests==2&&workspace.visible&&root.superview==host->_parent);
[workspace close];[workspace close];run.record(@"workspace-closes-host-window-once-and-stops-scopes",host->_closes==1&&!workspace.visible&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&!host->_permissionFailure&&host->_actionDepth==0);
+5 -1
查看文件
@@ -142,7 +142,11 @@
if(written)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];else [self reportError:@"宿主未保存蒙版关联,原设置已保留"];
}
- (void)workspaceCanvasSelection:(NSNotification*)note {
if(!_visible||_refreshingStack||![note.userInfo[@"mask"]length])return;NSString*mask=note.userInfo[@"mask"];if([mask isEqual:_selectedMask])return;[_selectedMask release];_selectedMask=[mask copy];if(![note.userInfo[@"node"]isEqual:@"shared"]){[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];}_editorMode=1;[self rebuildWorkspaceEditor];
if(!_visible||_refreshingStack||![note.userInfo[@"mask"]length])return;NSString*mask=note.userInfo[@"mask"];
if(!_trackingPreview.hidden&&!_trackingPreview.running&&![_trackingPreview.maskID isEqual:mask]){
[_trackingPreview reset];[self setTrackingPreviewVisible:NO];
}
if([mask isEqual:_selectedMask])return;[_selectedMask release];_selectedMask=[mask copy];if(![note.userInfo[@"node"]isEqual:@"shared"]){[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];}_editorMode=1;[self rebuildWorkspaceEditor];
}
- (void)externalWorkspaceToolSelection:(NSNotification*)note {
if(![note.userInfo[@"source"]isEqual:@"inspector"]||![note.userInfo[@"node"]length])return;_hasUserSelection=YES;[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];[_selectedMask release];_selectedMask=nil;if(_visible){_editorMode=0;[self refreshToolWorkspace:nil];}
+3 -3
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.13.0</string>
<string>1.15.0</string>
<key>CFBundleVersion</key>
<string>83</string>
<string>96</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.13.0</string>
<string>1.15.0</string>
</dict>
<dict>
<key>className</key>
+19 -1
查看文件
@@ -1,5 +1,23 @@
#import <FxPlug/FxPlugSDK.h>
#import "DYDiagnostics.h"
#import "../Shared/DYBetaDiagnostics.h"
#import "../Shared/DYCodeIntegrity.h"
#include <string.h>
int main(int argc,const char*argv[]){@autoreleasepool{if(argc==2&&strcmp(argv[1],"--self-test")==0)return DYRunDiagnostics();DYBetaStart();[FxPrincipal startServicePrincipal];DYBetaStop();return 0;}}
#include <sysexits.h>
int main(int argc, const char *argv[]) {
@autoreleasepool {
NSString *component = nil;
OSStatus status = DYValidateRunningInstallation(DYCodeRoleService, &component);
if (status != errSecSuccess) {
NSLog(@"大鱼调色拒绝启动插件服务,验签失败 (%@, %d)。%@", component, (int)status,
DYIntegrityRecoveryMessage);
return EX_CONFIG;
}
if (argc == 2 && strcmp(argv[1], "--self-test") == 0) return DYRunDiagnostics();
DYBetaStart();
[FxPrincipal startServicePrincipal];
DYBetaStop();
return 0;
}
}
+13
查看文件
@@ -0,0 +1,13 @@
#import <Foundation/Foundation.h>
#import <Security/Security.h>
typedef NS_ENUM(NSInteger, DYCodeRole) {
DYCodeRoleWrapper,
DYCodeRoleService,
};
FOUNDATION_EXPORT NSString *const DYPluginRelativePath;
FOUNDATION_EXPORT NSString *const DYIntegrityRecoveryMessage;
FOUNDATION_EXPORT OSStatus DYValidateSignedInstallation(NSURL *wrapperURL, NSString **failedComponent);
FOUNDATION_EXPORT OSStatus DYValidateRunningInstallation(DYCodeRole role, NSString **failedComponent);
+96
查看文件
@@ -0,0 +1,96 @@
#import "DYCodeIntegrity.h"
NSString *const DYPluginRelativePath = @"Contents/PlugIns/大鱼调色 XPC Service.pluginkit";
NSString *const DYIntegrityRecoveryMessage = @"大鱼调色未通过官方签名或完整性验证。请使用原始安装包重新安装。";
static NSString *const DYWrapperIdentifier = @"com.dayu.color";
static NSString *const DYServiceIdentifier = @"com.dayu.color.XPC";
static OSStatus DYCreateSigningRequirement(NSString *identifier, SecRequirementRef *requirement) {
// Pin the Developer ID team and signing identifier, allowing certificate renewal.
NSString *text = [NSString stringWithFormat:
@"identifier \"%@\" and anchor apple generic and "
"certificate 1[field.1.2.840.113635.100.6.2.6] exists and "
"certificate leaf[field.1.2.840.113635.100.6.1.13] exists and "
"certificate leaf[subject.OU] = \"B3W25FX5H5\"", identifier];
return SecRequirementCreateWithString((__bridge CFStringRef)text, kSecCSDefaultFlags, requirement);
}
static OSStatus DYValidateRunningCode(NSString *identifier) {
SecRequirementRef requirement = NULL;
OSStatus status = DYCreateSigningRequirement(identifier, &requirement);
if (status != errSecSuccess) return status;
SecCodeRef code = NULL;
status = SecCodeCopySelf(kSecCSDefaultFlags, &code);
if (status == errSecSuccess) {
status = SecCodeCheckValidity(code, kSecCSDefaultFlags, requirement);
CFRelease(code);
}
CFRelease(requirement);
return status;
}
static OSStatus DYValidateBundle(NSURL *url, NSString *identifier, SecCSFlags flags) {
SecRequirementRef requirement = NULL;
OSStatus status = DYCreateSigningRequirement(identifier, &requirement);
if (status != errSecSuccess) return status;
SecStaticCodeRef code = NULL;
status = SecStaticCodeCreateWithPath((__bridge CFURLRef)url, kSecCSDefaultFlags, &code);
if (status == errSecSuccess) {
status = SecStaticCodeCheckValidity(code, flags, requirement);
CFRelease(code);
}
CFRelease(requirement);
return status;
}
static OSStatus DYValidateInstallation(NSURL *wrapperURL, SecCSFlags wrapperFlags, SecCSFlags serviceFlags,
NSString **failedComponent) {
if (failedComponent) *failedComponent = @"wrapper";
OSStatus status = DYValidateBundle(wrapperURL, DYWrapperIdentifier, wrapperFlags);
if (status != errSecSuccess) return status;
if (failedComponent) *failedComponent = @"service";
NSURL *serviceURL = [wrapperURL URLByAppendingPathComponent:DYPluginRelativePath isDirectory:YES];
status = DYValidateBundle(serviceURL, DYServiceIdentifier, serviceFlags);
if (status != errSecSuccess) return status;
// A separately signed older service with the same identity must not be mixed into this build.
NSDictionary *wrapper = [NSDictionary dictionaryWithContentsOfURL:[wrapperURL URLByAppendingPathComponent:@"Contents/Info.plist"]];
NSDictionary *service = [NSDictionary dictionaryWithContentsOfURL:[serviceURL URLByAppendingPathComponent:@"Contents/Info.plist"]];
if (failedComponent) *failedComponent = @"component-build";
if (![wrapper[@"CFBundleVersion"] isEqual:service[@"CFBundleVersion"]] ||
![wrapper[@"CFBundleShortVersionString"] isEqual:service[@"CFBundleShortVersionString"]]) return errSecCSReqFailed;
if (failedComponent) *failedComponent = nil;
return errSecSuccess;
}
OSStatus DYValidateSignedInstallation(NSURL *wrapperURL, NSString **failedComponent) {
const SecCSFlags strict = kSecCSStrictValidate | kSecCSCheckAllArchitectures;
return DYValidateInstallation(wrapperURL, strict, strict | kSecCSCheckNestedCode, failedComponent);
}
OSStatus DYValidateRunningInstallation(DYCodeRole role, NSString **failedComponent) {
BOOL isService = role == DYCodeRoleService;
if (failedComponent) *failedComponent = isService ? @"running-service" : @"running-wrapper";
OSStatus status = DYValidateRunningCode(isService ? DYServiceIdentifier : DYWrapperIdentifier);
if (status != errSecSuccess) return status;
NSURL *bundleURL = NSBundle.mainBundle.bundleURL.URLByResolvingSymlinksInPath;
NSURL *wrapperURL = bundleURL;
if (isService) {
// The service must be embedded in the wrapper being verified.
for (NSInteger level = 0; level < 3; level++) wrapperURL = wrapperURL.URLByDeletingLastPathComponent;
NSURL *expected = [wrapperURL URLByAppendingPathComponent:DYPluginRelativePath isDirectory:YES];
if (failedComponent) *failedComponent = @"service-location";
if (![wrapperURL.pathExtension isEqualToString:@"app"] ||
![bundleURL.path isEqualToString:expected.path]) return errSecCSBadBundleFormat;
}
// At launch, verify both native executables and their signed identities.
// Leave resource and nested-framework traversal to downloaded-package verification.
return DYValidateInstallation(wrapperURL, kSecCSDoNotValidateResources, kSecCSDoNotValidateResources,
failedComponent);
}
+73 -9
查看文件
@@ -1,9 +1,16 @@
#import "AppDelegate.h"
#import "DYBetaUpdater.h"
#import "../Shared/DYBetaDiagnostics.h"
#import "../Shared/DYCodeIntegrity.h"
static NSString *const DYPluginID = @"com.dayu.color.XPC";
static NSString *const DYReleaseAddress = @"https://dayu.media";
static dispatch_queue_t DYPluginRegistrationQueue(void) {
static dispatch_queue_t queue;
static dispatch_once_t once;
dispatch_once(&once, ^{ queue = dispatch_queue_create("com.dayu.color.registration", DISPATCH_QUEUE_SERIAL); });
return queue;
}
static NSColor *DYColor(CGFloat r, CGFloat g, CGFloat b) { return [NSColor colorWithSRGBRed:r green:g blue:b alpha:1]; }
static NSColor *DYBlue(void) { return DYColor(.36,.65,1); }
static NSColor *DYGreen(void) { return DYColor(.26,.86,.53); }
@@ -125,6 +132,7 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
@property(assign) NSProgressIndicator *updateProgress;
@property(retain) NSTimer *updateProgressTimer;
@property BOOL updateCheckDone;
@property BOOL integrityRejected;
@end
@implementation AppDelegate
@@ -278,32 +286,84 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
}
return NO;
}
- (BOOL)registry:(NSDictionary *)query listsExactPath:(NSString *)path {
NSString *suffix = [@"\t" stringByAppendingString:path];
for (NSString *line in [query[@"output"] componentsSeparatedByCharactersInSet:NSCharacterSet.newlineCharacterSet]) {
if ([line hasSuffix:suffix]) return YES;
}
return NO;
}
- (NSString *)removeRejectedPluginRegistration:(NSString *)path {
NSArray *arguments = @[@"-m",@"-A",@"-D",@"-v",@"-i",DYPluginID];
NSDictionary *before = [self runPluginKit:arguments];
if ([before[@"code"] intValue] != 0) return @"query-failed";
if (![self registry:before listsExactPath:path]) return @"not-registered";
if (![path.stringByStandardizingPath isEqualToString:path.stringByResolvingSymlinksInPath]) return @"skipped-symlink";
[self runPluginKit:@[@"-r",path]];
NSDictionary *after = [self runPluginKit:arguments];
if ([after[@"code"] intValue] != 0 || [self registry:after listsExactPath:path]) return @"removal-unverified";
return @"removed";
}
- (void)rejectModifiedInstallation:(NSDictionary *)results {
if (self.integrityRejected || self.terminating) return;
self.integrityRejected = YES;
[self.updater stopForIntegrityFailure];
[self finishRegistration:NO details:DYIntegrityRecoveryMessage results:results];
self.retryButton.enabled = NO;
self.exitDetail.stringValue = @"此副本的自动更新已停用。请安装原始安装包后重新打开。";
NSString *path = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:DYPluginRelativePath];
dispatch_async(DYPluginRegistrationQueue(), ^{
@autoreleasepool {
NSString *removal = [self removeRejectedPluginRegistration:path];
dispatch_async(dispatch_get_main_queue(), ^{
self.diagnostics[@"registrationRevocation"] = removal;
[self writeDiagnostics];
});
}
});
}
- (void)checkRegistration:(id)sender {
if (self.integrityRejected) return;
if (self.diagnostics && (self.registrationState == DYChecking || self.registrationState == DYRegistering)) return;
[self.exitTimer invalidate]; self.exitTimer = nil; self.registrationState = DYChecking;
self.retryButton.enabled = NO; self.retryButton.title = @"检查中…";
self.statusTitle.stringValue = @"正在检查插件…"; self.statusTitle.textColor = NSColor.whiteColor;
self.statusDetail.stringValue = @"正在检查本机插件登记,随后自动提交注册。";
self.progress.indeterminate = YES; [self.progress startAnimation:nil];
NSString *path = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"Contents/PlugIns/大鱼调色 XPC Service.pluginkit"];
NSString *path = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:DYPluginRelativePath];
self.diagnostics = [NSMutableDictionary dictionaryWithDictionary:@{
@"bundleID":NSBundle.mainBundle.bundleIdentifier,@"version":[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
@"build":[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"],@"executable":NSBundle.mainBundle.executablePath,
@"bundleID":NSBundle.mainBundle.bundleIdentifier ?: @"",@"version":[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"] ?: @"",
@"build":[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"] ?: @"",@"executable":NSBundle.mainBundle.executablePath ?: @"",
@"pid":@(NSProcessInfo.processInfo.processIdentifier),@"plugin":path,@"status":@"checking"}];
dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0), ^{
dispatch_async(DYPluginRegistrationQueue(), ^{
@autoreleasepool {
NSString *failedComponent = nil;
OSStatus status = DYValidateRunningInstallation(DYCodeRoleWrapper, &failedComponent);
if (status != errSecSuccess) {
NSDictionary *results = @{@"integrity":@"rejected", @"integrityComponent":failedComponent,
@"integrityOSStatus":@(status)};
dispatch_async(dispatch_get_main_queue(), ^{
[self rejectModifiedInstallation:results];
});
return;
}
NSBundle *plugin = [NSBundle bundleWithPath:path];
NSDictionary *attributes = [plugin objectForInfoDictionaryKey:@"PlugInKit"][@"Attributes"];
BOOL validComponent = [plugin.bundleIdentifier isEqualToString:DYPluginID] &&
[[plugin objectForInfoDictionaryKey:@"CFBundleVersion"] isEqual:[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]] &&
[attributes[@"com.apple.protocol"] isEqual:@"FxPlug"] && [attributes[@"com.apple.version"] isEqual:@"1.1"];
if (!validComponent) {
dispatch_async(dispatch_get_main_queue(), ^{ [self finishRegistration:NO details:@"未找到完整的插件组件。请从发布地址重新安装大鱼调色。" results:@{}]; }); return;
dispatch_async(dispatch_get_main_queue(), ^{
if (!self.integrityRejected)
[self finishRegistration:NO details:@"未找到完整的插件组件。请从发布地址重新安装大鱼调色。" results:@{}];
}); return;
}
// The stand-alone wrapper can inspect the registry directly. Registration
// and actual host rendering remain separate states; the user confirms FCP.
NSDictionary *before = [self runPluginKit:@[@"-m",@"-v",@"-i",DYPluginID]];
dispatch_async(dispatch_get_main_queue(), ^{
if (self.integrityRejected) return;
self.registrationState = DYRegistering; self.statusTitle.stringValue = @"正在注册插件…";
self.statusDetail.stringValue = @"正在向系统提交插件注册,并核对当前安装位置。";
});
@@ -318,10 +378,12 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
NSString *message = registered ?
@"已确认当前插件登记。请在 Final Cut Pro 中实际应用并确认效果正常;若宿主已打开,请保存后重新打开。" :
@"插件注册尚未完成。请点击“重新检查”,或重新安装后再试。窗口将保持打开。";
NSDictionary *results = @{@"before":before,@"submission":add,@"after":after ?: @{},@"registered":@(registered),
NSDictionary *results = @{@"integrity":@"verified",@"before":before,@"submission":add,@"after":after ?: @{},@"registered":@(registered),
@"discoveryVerified":@(registered),@"submissionAccepted":@(submissionAccepted),@"hostVerification":@"awaiting-user-confirmation",
@"confirmationMethod":registered ? @"exact-path-discovery" : @"unconfirmed"};
dispatch_async(dispatch_get_main_queue(), ^{ [self finishRegistration:registered details:message results:results]; });
dispatch_async(dispatch_get_main_queue(), ^{
if (!self.integrityRejected) [self finishRegistration:registered details:message results:results];
});
}
});
}
@@ -330,7 +392,7 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
self.registrationState = success ? DYReady : DYFailed;
[self.progress stopAnimation:nil]; self.progress.indeterminate = NO; self.progress.doubleValue = success ? 100 : 0;
self.registrationCard.tint = success ? DYGreen() : DYColor(1,.67,.30); [self.registrationCard setNeedsDisplay:YES];
self.statusTitle.stringValue = success ? @"✓ 插件注册成功" : @"需要重新检查";
self.statusTitle.stringValue = success ? @"✓ 插件注册成功" : (self.integrityRejected ? @"安装完整性验证失败" : @"需要重新检查");
self.statusTitle.textColor = success ? DYGreen() : DYColor(1,.75,.4); self.statusDetail.stringValue = details;
self.retryButton.title = @"重新检查"; self.retryButton.enabled = YES;
self.confirmationButton.enabled = success;
@@ -352,12 +414,14 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe
- (void)updateChanged:(NSDictionary *)state {
if(self.terminating)return;
NSString *phase=state[@"phase"];
BOOL rejected = [phase isEqual:@"integrity_rejected"];
if (rejected) [self rejectModifiedInstallation:@{@"integrity":@"rejected"}];
BOOL busy=[@[@"checking",@"downloading",@"validating"]containsObject:phase];
BOOL available=[@[@"available",@"ready",@"host_wait",@"installer"]containsObject:phase];
if(![phase isEqual:@"checking"]){self.updateCheckDone=YES;if(available)[self keepIntroduction:nil];}
self.updateTitle.stringValue=[phase isEqual:@"available"]?state[@"message"]:@"公测更新";
self.updateDetail.stringValue=state[@"message"]?:@"";
self.updateCheckButton.enabled=!busy;
self.updateCheckButton.enabled=!busy && !rejected;
self.updateInstallButton.enabled=[@[@"available",@"ready",@"host_wait",@"installer"]containsObject:phase];
self.updateInstallButton.title=[phase isEqual:@"available"]?@"下载更新":@"安装更新";
self.updateCancelButton.hidden=![phase isEqual:@"downloading"];
@@ -6,6 +6,7 @@
- (void)check;
- (void)download;
- (void)install;
- (void)stopForIntegrityFailure;
- (void)cancel;
+ (BOOL)validateManifest:(NSDictionary *)manifest error:(NSError **)error;
+ (BOOL)validatePackage:(NSURL *)package manifest:(NSDictionary *)manifest error:(NSError **)error;
@@ -1,5 +1,6 @@
#import "DYBetaUpdater.h"
#import "../Shared/DYBetaDiagnostics.h"
#import "../Shared/DYCodeIntegrity.h"
#import <AppKit/AppKit.h>
#import <CommonCrypto/CommonDigest.h>
#include <atomic>
@@ -31,6 +32,7 @@ static NSString *command(NSString *path,NSArray *arguments,NSError **error) {
NSURL *_package;
NSDictionary *_state,*_manifest;
std::atomic_uint _generation;
BOOL _integrityRejected;
}
- (void)emit:(NSString *)phase message:(NSString *)message;
@end
@@ -57,6 +59,21 @@ static NSString *command(NSString *path,NSArray *arguments,NSError **error) {
if(!NSThread.isMainThread){dispatch_async(dispatch_get_main_queue(),^{[self emit:phase message:message];});return;}
[_state release];_state=[@{@"phase":phase,@"message":message?:@"",@"version":_manifest[@"version"]?:@""}copy];if(self.changed)self.changed(_state);
}
- (BOOL)requireOfficialInstallation {
if (_integrityRejected) return NO;
if (DYValidateRunningInstallation(DYCodeRoleWrapper, NULL) == errSecSuccess) return YES;
[self stopForIntegrityFailure];
return NO;
}
- (void)stopForIntegrityFailure {
if (_integrityRejected) return;
_integrityRejected = YES;
++_generation;
[_task cancel];
[_manifest release]; _manifest = nil;
[_package release]; _package = nil;
[self emit:@"integrity_rejected" message:DYIntegrityRecoveryMessage];
}
+ (BOOL)validateManifest:(NSDictionary *)manifest error:(NSError **)error {
if(![manifest isKindOfClass:NSDictionary.class]){if(error)*error=DYUpdateError(@"公测更新清单格式错误。");return NO;}
id build=manifest[@"build"],size=manifest[@"size"];
@@ -90,13 +107,12 @@ static NSString *command(NSString *path,NSArray *arguments,NSError **error) {
}
if(apps.count!=1){if(error)*error=DYUpdateError(@"更新包必须包含一个完整的大鱼调色 APP。");return NO;}
NSURL *app=apps.firstObject;NSDictionary *info=[NSDictionary dictionaryWithContentsOfURL:[app URLByAppendingPathComponent:@"Contents/Info.plist"]];
NSDictionary *plugin=[NSDictionary dictionaryWithContentsOfURL:[app URLByAppendingPathComponent:@"Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/Info.plist"]];
NSURL *service=[app URLByAppendingPathComponent:DYPluginRelativePath isDirectory:YES];
NSDictionary *plugin=[NSDictionary dictionaryWithContentsOfURL:[service URLByAppendingPathComponent:@"Contents/Info.plist"]];
if(![info[@"CFBundleIdentifier"]isEqual:@"com.dayu.color"]||![plugin[@"CFBundleIdentifier"]isEqual:@"com.dayu.color.XPC"]||
[info[@"CFBundleVersion"]integerValue]!=[manifest[@"build"]integerValue]||[plugin[@"CFBundleVersion"]integerValue]!=[manifest[@"build"]integerValue]||
![info[@"CFBundleShortVersionString"]isEqual:manifest[@"version"]]){if(error)*error=DYUpdateError(@"更新包产品或版本与清单不一致。");return NO;}
if(!command(@"/usr/bin/codesign",@[@"--verify",@"--deep",@"--strict",app.path],error))return NO;
NSString *identity=command(@"/usr/bin/codesign",@[@"-dvvv",app.path],error);
if(![identity containsString:@"TeamIdentifier=B3W25FX5H5"]){if(error)*error=DYUpdateError(@"包内 APP 签名团队不匹配。");return NO;}
if(DYValidateSignedInstallation(app,NULL)!=errSecSuccess){if(error)*error=DYUpdateError(@"更新包内的 APP 或插件未通过官方签名验证。");return NO;}
// Product PKGs install the wrapper at its fixed FxPlug location and carry templates.
BOOL appTarget=NO,templates=NO;
for(NSURL *url in [NSFileManager.defaultManager enumeratorAtURL:inspection includingPropertiesForKeys:nil options:0 errorHandler:nil]){
@@ -116,6 +132,7 @@ static NSString *command(NSString *path,NSArray *arguments,NSError **error) {
}
- (void)check {
NSString *phase=_state[@"phase"];if([@[@"checking",@"downloading",@"validating"]containsObject:phase])return;
if (![self requireOfficialInstallation]) return;
unsigned generation=++_generation;[self emit:@"checking" message:@"正在检查公测更新…"];
NSString *url=[NSString stringWithFormat:@"https://dayu.media/wp-json/dayu-color/v1/update?bundle_id=com.dayu.color&channel=beta&current_build=%@",([NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]?:@"0")];
NSMutableURLRequest *request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:url] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:6];
@@ -137,6 +154,7 @@ static NSString *command(NSString *path,NSArray *arguments,NSError **error) {
}
- (void)download {
if(![_state[@"phase"]isEqual:@"available"])return;NSError *error=nil;
if (![self requireOfficialInstallation]) return;
if(![DYBetaUpdater validateManifest:_manifest error:&error]){[self emit:@"failed" message:error.localizedDescription];return;}
if([_manifest[@"build"]integerValue]<=[[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]integerValue])return;
unsigned generation=++_generation;NSDictionary *manifest=[[_manifest copy]autorelease];[self emit:@"downloading" message:@"正在下载公测更新,可随时取消。"];
@@ -147,7 +165,9 @@ static NSString *command(NSString *path,NSArray *arguments,NSError **error) {
if(!error&&[(NSHTTPURLResponse*)response statusCode]==200&&DYBetaAllowedURL(response.URL,YES)){
[NSFileManager.defaultManager removeItemAtURL:destination error:nil];
if([NSFileManager.defaultManager moveItemAtURL:temporary toURL:destination error:&error]){
[self emit:@"validating" message:@"正在验证完整性、签名、公证和插件版本…"];
dispatch_async(dispatch_get_main_queue(), ^{
if(generation==self->_generation.load()) [self emit:@"validating" message:@"正在验证完整性、签名、公证和插件版本…"];
});
BOOL valid=[DYBetaUpdater validatePackage:destination manifest:manifest error:&error];
if(!valid&&!error)error=DYUpdateError(@"更新包未通过验证。");
}
@@ -163,15 +183,20 @@ static NSString *command(NSString *path,NSArray *arguments,NSError **error) {
}
- (void)install {
if(![@[@"ready",@"host_wait",@"installer"]containsObject:_state[@"phase"]])return;
if (![self requireOfficialInstallation]) return;
for(NSString *ID in @[@"com.apple.FinalCut",@"com.apple.FinalCutApp",@"com.apple.motionapp",@"com.apple.motionappApp"])
if([NSRunningApplication runningApplicationsWithBundleIdentifier:ID].count){[self emit:@"host_wait" message:@"请先保存并正常退出 FCP / Motion,再点击安装更新。不会强制退出宿主。"];
DYBetaEvent(@"update_installer",@{@"status":@"waiting_for_host"});return;}
if(_package&&[NSWorkspace.sharedWorkspace openURL:_package]){
if (!_package || ![digest(_package) isEqualToString:_manifest[@"sha256"]]) {
[self emit:@"failed" message:@"更新包已更改或不可读。请重新检查并下载更新。"];
return;
}
if([NSWorkspace.sharedWorkspace openURL:_package]){
[NSUserDefaults.standardUserDefaults setObject:_manifest[@"build"] forKey:@"betaPendingUpdateBuild"];[self emit:@"installer" message:@"已打开系统安装程序,请按提示授权并完成安装。"];
DYBetaEvent(@"update_installer",@{@"status":@"system_installer_opened"});}
else [self emit:@"failed" message:@"无法打开系统安装程序,请重试。"];
}
- (void)cancel {++_generation;[_task cancel];BOOL newer=[_manifest[@"build"]integerValue]>[[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]integerValue];[self emit:newer?@"available":@"idle" message:@"已取消,不影响当前插件。"];}
- (void)cancel {if(_integrityRejected)return;++_generation;[_task cancel];BOOL newer=[_manifest[@"build"]integerValue]>[[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]integerValue];[self emit:newer?@"available":@"idle" message:@"已取消,不影响当前插件。"];}
- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest *))completion {
BOOL download=[task isKindOfClass:NSURLSessionDownloadTask.class];completion(DYBetaAllowedURL(request.URL,download)?request:nil);
}
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.13.0</string>
<string>1.15.0</string>
<key>CFBundleVersion</key>
<string>83</string>
<string>96</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
+64 -7
查看文件
@@ -1,18 +1,57 @@
# 大鱼调色开发交接
更新于 2026-11-05(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。
更新于 2026-11-06(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。
## 当前基线
| 项目 | 已核对状态 |
| --- | --- |
| 工程与源码 | `/Volumes/备份/大鱼调色/大鱼调色`,`大鱼调色.xcodeproj`,`Wrapper Application` / Release。远程为 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。本轮开发基线为 `504e08e425e44a271e1e0be819cf6a593d4b786c`。 |
| 本机正式安装 | **1.13.0(83)**,`/Library/Plug-Ins/FxPlug/大鱼调色.app`。外层 ID `com.dayu.color`,服务 ID `com.dayu.color.XPC`。实际编译源码 `9977b5c41b07e0b08e6408c492498ba6e396c981`。签名、公证、票据和本机正式路径通过。[交付](verification/Delivery.json) · [宿主验收](verification/HostCloneStamp1.13.0.json) |
| Git Release | 1.12.1(81),标签 `v1.12.1-canvas-inspector-20261105` 指向 `9f0adbeb3b1b902b66ac4be7169b919f82675f21`。签名公证 PKG 已发布为公测,草稿和正式附件均完成完整下载校验。本地包位于 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.12.1.pkg`。[发布页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.12.1-canvas-inspector-20261105) · [发布核验](verification/Release.json) |
| 站点及自动更新 | 本次交接回读时,原文章与主 APP 公测通道均为 **1.12.0(79)**。主 APP 启动时自动检查,发现新版后由用户确认下载和安装。[原文章](https://dayu.media/15792/) · [文章核验](verification/Article1.12.0.json) · [更新通道核验](verification/BetaPublication1.12.0.json) |
| 工程与源码 | `/Volumes/备份/大鱼调色/大鱼调色`,`大鱼调色.xcodeproj`,`Wrapper Application` / Release。远程为 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。1.15.0(96)实际编译节点为 `a2a6e57c13977ea2fc313f91b4d765ea86498f10`。 |
| 本机正式安装 | **1.15.0(96)**,`/Library/Plug-Ins/FxPlug/大鱼调色.app`。公证、票据、Gatekeeper、唯一 PluginKit 路径及 898 项正式原生自检通过。[交付](verification/Delivery.json) · [宿主验收](verification/HostLevel1.15.0.json) |
| Git Release | **1.15.0(96)** 已签名公证并验包,正式包位于 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.15.0.pkg`。版本 Release 正在进行远端下载核验。[安装包](verification/Package.json) |
| 站点及自动更新 | 原文章 15792 的主下载已切换至 **1.14.4(95)**,正文顶部显示验签修复和重新下载安装提醒。站内附件 15865 已完整下载,内容与正式包逐字节一致。主 APP 公测通道上次回读为 **1.12.0(79)**。[原文章](https://dayu.media/15792/) · [文章核验](verification/Article1.14.4.json) · [更新通道核验](verification/BetaPublication1.12.0.json) |
| 本机开发与验收 | AppKit / Objective-C++ / FxPlug 4 / Metal,Apple Silicon,macOS 14.6+。交付记录使用 Xcode 27.1、FxPlug SDK 4.3.5 和 FCP 12.4。构建缓存为 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`,验收素材库位于其中的 `fcp-qa/大鱼调色_验收.fcpbundle`。产品交付锁为 `/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock`,接手时重新检查。 |
## 1.13.0 画布响应与仿制图章
## 1.15.0 深色默认、独立效果与水平校正
- 新用户默认深色,保存过的浅色选择会被读取。独立效果使用既有的 FxPlug 和工具文档,分别预置并展开一级调色、HSL 混色。整合版保持原路径、滤镜 UUID 和发布项。独立 `.moef` 只发布自定义检查器,模板无版权或网址发布项。三个效果随同一 PKG 安装。
- 「水平校正」支持水平或垂直、两点或拖线。按实际画面宽高比计算旋转及覆盖四角的最小放大倍率。校正应用于完整效果输出,屏幕蒙版和图章位置按同一变换映射。校正状态随效果和完整预设保存,Cube 导出会提示改用完整预设。
- FCP 12.4 独立验收库确认两个独立效果的初始模块、控制面板和继续添加模块,整合版原四组及混合仍可见。载入 −8° 校正预设后,合成网格拉平、画面覆盖四角,冷重开继续生效。两点、拖线、撤销、重置和 Esc 由 898 项正式原生自检中的 OSC 回调覆盖。自动实窗鼠标未进入 FCP 的 OSC,手动实机画线仍待复核。[验收范围](verification/HostLevel1.15.0.json)
- 接手续测时可打开缓存中的独立资源库 `fcp-qa/level-1.15.0/未命名.fcpbundle`,选中 HSL 或一级调色片段,从画面右下角校正图标手动画线,复测保存与撤销。
## 1.14.4 安装权限和启动验签
- 94 版分发后,多名用户反馈“安装完整性验证失败”。用户提供的修复记录指出有四个不可读资源及一份放在 `/Applications` 的重复 App。94 正式 PKG 的 BOM 恰有四个 `root:wheel`、`0700` 文件,分别为外层 App 的 `Basis_balanceWheel.png` 和内置模板的 `large.png`、`small.png`、`大鱼调色.moef`。在原签名副本上模拟读权限丢失可复现严格验签的 `Permission denied`,修正为 `0644` 后通过,不需要重签。PKG 自身的载荷与脚本均指向固定 FxPlug 路径并禁用重定位。未获取受影响设备的诊断或确认重复副本来源。
- 94 包中主 App 和插件服务的 Apple Developer ID 证书链均完整。单独使用系统信任根、排除用户钥匙串和联网,两条链均通过。开发机本轮复核的 94 App 是由交付脚本复制、当前用户持有的正式安装,能读取这些文件,未覆盖安装器改为 `root` 后的权限场景。
- 95 版启动和注册检查两个可执行文件、Apple Developer ID 团队、签名标识、位置关系和版本一致性。全资源和嵌套框架扫描保留给下载更新包,签名改动、重签、缺失及混装对照检查通过。交付脚本将上述四个资源设为 `0644`,打包前检查实际 App,公证后检查最终 BOM。未发布的原始 95 候选经新权限门槛确认失败后重制,历史 94 包保留。第三方机器的新版安装结果仍需回访。
- 原文 15792 已绑定附件 15865「大鱼调色-1.14.4.pkg」,在正文顶部提示验签修复并请遇到报错的用户重装。原标题和 SEO 继续描述 1.14.3 的跟踪更新,安装段已指向 1.14.4。正式下载目标取回 45,381,319 字节,与本地正式包逐字节一致,下载副本的公证票据验证通过。封面、分类、价格和会员规则回读一致。[站点验收](verification/Article1.14.4.json)
## 1.14.3 站点文章
- 在原文 15792 就地发布 1.14.3(94),更新版本介绍、安装说明、SEO、特色图片与站内主包。正文展示用户提交的 2046×1570 原图。1672×941 封面注明「不加密 · 不限制安装数量」。文章的历史界面图片、普通用户 50 元和鱼粉会员 0 元均经前台核验。
- 文章主包下载名为「大鱼调色-1.14.3.pkg」,完整下载与公证发行包的字节数及 SHA-256 一致。发布输入与两张图片保存在 [1.14.3 发布目录](Publishing/1.14.3/),前后台和附件验证见 [站点验收](verification/Article1.14.3.json)。下次更新从文章 15792 的当前内容和资源字段回读开始。
## 1.14.3 图章稳定与逐帧跟踪预览
- `DYToolState.mm` 在连续分析段写入前,使用最多五帧的对称窗口平滑图章两侧坐标和对数缩放,起点与最后可信帧保持原值。Metal 跟踪渲染支持连续的亚像素取样,相对缩放经过 1 倍时连续过渡。取样跨出画面边缘时在最后一个像素内过渡。旧图章重新执行双向跟踪即可应用轨迹平滑。
- 仿制图章和普通蒙版共用控制面板右侧的进度和同步预览。预览采用同一分析帧的画面与轮廓,图章显示青色取样和黄色覆盖,普通蒙版显示黄色轮廓。进度统计双向分析时的唯一帧数,进度条直接按比例绘制。自动分析期间时间线播放头停在起始位置,单帧跟踪仍按宿主时间映射移动播放头。
- 在上次 257 帧 4K 轨迹离线回放中,取样中心二阶帧差 RMS 从 2.71 降到 0.95 像素,覆盖中心从 2.43 降到 0.92 像素。独立实拍副本中,图章和矩形蒙版均完成 190 帧跟踪,保存回读为连续 25 fps。94 版重跑验证了画面、轮廓和进度,51% 时条形填充与数值一致。验收覆盖本机 Final Cut Pro 12.4 与原生自检。[实拍验收](verification/HostTrackingPreview1.14.3.json)
- 接续实拍反馈时,先在原问题片段重新跟踪旧图章,记录方向、首个异常时间码和取样区。若需复测,可使用本机验收库的独立副本。
## 1.14.0 图章取样与覆盖跟踪
- 用户在 1.13.4 的实拍工程中确认图章可落位、拖动,随后要求取样点和覆盖目标都参与跟踪并识别缩放。[1.13.4 实鼠确认](verification/HostCloneStampSave1.13.4.json)
- 两个区域各自使用同一宿主源帧运行 OpenCV 分析。写入的每个轨迹键同时记录两点的位置与缩放。任一侧跟丢时,提交本次最后一段两侧均可信的连续轨迹。普通蒙版沿用原分析。旧图章单点轨迹仍按位移求值,可重新跟踪以获得双点数据。
- 覆盖圈随覆盖区域缩放。渲染按取样区域和覆盖区域的相对缩放映射当前帧的源像素,两侧缩放相同时保留整数像素平移。调大或调小覆盖范围仍可独立操作。清除轨迹时将当前帧的图章外观保留为静态值。
- 89 版在 FCP 12.4 实拍素材上完成正向和双向跟踪。双向导出得到 257 个连续双点键,并发现片尾一个原有自动键与最后的新键只差 6.33 毫秒。90 版按半帧识别同帧自动键,在分析范围边缘替换旧键,同时保留手工编辑和分析范围之外的轨迹。90 版在同一 4K 源帧上生成 257 个连续双点键,无旧键残留。最终帧横纵缩放分别约为取样 1.387 / 1.689 倍,覆盖 1.169 / 1.203 倍。两边各有独立的中心轨迹。[1.14.0 实拍与原生核验](verification/HostCloneTracking1.14.0.json)
## 1.13.1 等像素复制与取样十字拖动
- 选中图章后可拖动青色取样十字。拖动时更新标记,松手后换取样位置并形成一次撤销。Esc 取消,旧图章可直接编辑。源点调整适用于图章的全部帧,目标位置轨迹保持原样。
- Metal 按整数像素偏移直接复制当前帧中的原像素,羽化只混合覆盖边缘。改变椭圆宽高只修改覆盖范围。画布和工作区移除图章旋转控件。跟踪继续用现有分析器求解运动,图章只应用中心位移。旧项目的轨迹键保留,历史缩放与旋转分量在图章求值时忽略。普通蒙版仍使用原有变换。
- 入口为 `DYToolOSC.inc.h`、`DYToolCanvasEditing.inc.h`、`DYToolHostMethods.inc.h`、`DYToolState.mm` 和 `DYGrade.metal`。画布写回继续校验时间、图章 ID 和外部修改冲突。原生检查覆盖一次撤销、Esc 取消、拖动和调尺寸时保持跟踪键,以及实际 Metal 输出的等像素复制。
## 1.13.0 历史交付 · 画布响应与仿制图章
- 旧版工具栏重绘会清零并上传整张 CPU 位图。无蒙版、未进入图章取样时,新版只绘制工具栏和已打开面板所需的区域,并沿用宿主提供的透明画布。4K、2 倍缩放的空闲工具栏位图为 1000×134,约占 3840×2160 的 1.6%。蒙版与图章绘制仍可能使用整画布。
- 工具文档复制改用内存深拷贝,已验证的不可变文档副本共享内容。每帧快照直接从选中的关键帧生成,不再绕一次序列化往返,也只为胶片层读取颗粒参数。M4 合成测试用四条各含 2400 个键的轨迹,40 次复制平均耗时从 18.018 ms 降到 10.949 ms。上述是局部测量,第三方反馈缺少触发动作、素材和工程,尚无法对同一场景前后复测。
@@ -41,12 +80,20 @@
## 验收与待跟进
- **86 版安装完整性加固。** `Shared/DYCodeIntegrity.m` 固定 Apple Developer ID Application、团队和签名标识,验证正在运行的代码及磁盘上的外层 APP、插件服务与签名资源。外层注册前拒绝改包并撤销此副本登记。XPC 在进入 FxPrincipal 前独立校验。更新器验签失败后取消本次运行的更新任务,停用检查、下载、安装,恢复须安装原包并重开。
- **分发与边界。** 原始 PKG 允许原样转发,无机器码或账号授权。用户选择保留后端自动更新策略,由新版本在本地拒绝改包。对方若保留签名内件,只在外部加装控制,内件验签仍可通过。缺少倒卖样本,实际改法待确认。拒绝路径、旧包校验、原版更新及宿主画面均有独立记录。[完整性测试](verification/Integrity1.13.2.json)
- **85 版历史防护评估。** 1.13.1(85)的正式 APP `com.dayu.color` 与 FxPlug 服务 `com.dayu.color.XPC` 都由 `B3W25FX5H5` 的 Developer ID Application 签名。该版的外层 `AppDelegate.m` 在调用 `pluginkit -a` 前只检查组件元数据。插件 `Plugin/main.m` 直接进入 `FxPrincipal`,效果清单为静态登记。
- **验签实测。** 用临时 Security.framework 探针对正式安装与独立副本执行静态签名校验,要求 Apple 签发的 Developer ID Application、指定 Team ID 和各自的签名标识。正式 APP 与服务均通过,错误标识、服务掉签、服务临时重签、Metal 资源被改及外层 APP 临时重签均被拒绝。仅重签外层时,原版内层服务单独校验仍通过。临时副本已清理。本轮未运行改包,也未获得倒卖样本,无法确认对方实际改动。
- **85 版像素复制与十字。** 正式安装的 864 项原生检查通过,实际 Metal 输出验证扩大覆盖只增加复制面积,重合像素逐值相同。FCP 12.4 独立项目副本读入 83 版图章,画布和工作区都只提供中心与尺寸控制,导出后原图章和 99 个轨迹键逐项一致。实窗自动拖动未产生宿主写入,十字拖动、一次撤销和 Esc 取消由正式安装版的原生回调覆盖。工作区“画面编辑”按钮仍沿用通用蒙版提示文字。[验收证据](verification/HostCloneSource1.13.1.json)
- **83 版图章与跟踪。** 安装后的 858 项原生检查通过。FCP 12.4 独立验收项目副本中已看到图标、取样十字、目标区及实际贴图。工作区触发真实正向跟踪,冷重开后导出的预设保留 99 个轨迹键,目标几何变化,取样坐标和尺寸一致。宿主测试通过载入验收预设创建图章。画布点击及拖选由原生 FxPlug 回调测试覆盖,自动鼠标输入没有进入实窗的 OSC 回调。[验收证据](verification/HostCloneStamp1.13.0.json)
- 正式 81 版通过 844 项原生检查。FCP 12.4 冷重开后,检视器顶部完整显示,曲线读到 57,600 个输出样本,原调色参数成功读回。同帧输出变更和检视器直方图刷新已通过原生检查。用户手动确认的是 80 版的画布曲线和实时直方图。[宿主验收](verification/HostCanvasInspector1.12.1.json)
- **画布白平衡待实机复核。** 已验证取样入口分发、播放头改变后的写入保护、白平衡求解、色温和色调写入及一次撤销。下一次实机验收补做系统取样界面的点选和取消,核对取样后色温与色调的实际变化。[宿主验收范围](verification/HostCanvasInspector1.12.1.json)
- **第三方 FCP 保存告警待反馈。** 本机内置 APFS 验收库未复现,退出重开读回正常。收到报错前的操作、时间、FCP 和插件版本、素材库位置后,再区分卷写入故障、素材库异常与特定插件写入触发;先保护原库与备份,复现在独立验收库进行。[保存告警排查](research/FinalCutSaveFailure-20261105.md)
- 站点文章和自动更新通道与 Git Release 是独立交付。后续若要将站点或更新通道升到 81,按发布任务核对现有线上版本、正式安装包和生产回滚记录。[更新部署说明](Backend/README.md)
- 站点文章、自动更新通道和 Git Release 分别交付。接手通道更新时,以实时清单、正式包和对应的生产回滚记录为准。[更新部署说明](Backend/README.md)
## 继续工作
@@ -65,3 +112,13 @@
| 2026-11-05 | 检视器、画布控件与保存告警排查 | 81 版正式安装并发布。80 版的画布反馈已复核,81 版修复检视器裁切与直方图刷新。剩余实机取样和第三方告警见上。 |
| 2026-11-05 | 建立每次任务的交接流程 | 新建本入口及项目规则,为历史专项交接加指引。回读核对了正式安装 81、远程版本标签、站点文章及公测通道 79。本轮成果为项目文档。 |
| 2026-11-05 | 画布响应与仿制图章 | 83 版正式安装,补齐图章渲染、现有跟踪复用及工作区编辑。性能局部测量、FCP 实帧和冷重开证据见本页,反馈场景待复现。 |
| 2026-11-05 | 仿制图章等像素复制与取样十字拖动 | 加入源点拖动和撤销,复制改为整数像素平移,目标跟踪保留中心位移。 |
| 2026-11-05 | 二次打包与重签防护评估 | 已核对注册和 XPC 启动入口,并用正式 85 版和改动副本验证候选验签规则。下一步可接入双入口校验并在正式安装版上复测 FCP。 |
| 2026-11-05 | 防二次加密和重签 | 1.13.2(86)正式安装。注册、服务启动和更新入口加入验签,FCP 和安装包通过验收。公测 Release 393 已发布并完整下载核对,站点及自动更新策略沿用原配置。 |
| 2026-11-05 | 更新 1.13.2 站点文章 | 在原文章 15792 更新正文、SEO 和主下载包,加入验签、原包转发规则、仿制图章与故障排查说明。原售价、会员权益、封面和历史图片均已回读,主包完整下载校验通过。公测自动更新通道回读为 1.12.0。 |
| 2026-11-06 | 仿制图章松手消失和拖动回弹 | FCP 在同一次手势给出相差约 32 毫秒的绘制时间与参数写入时间。88 版将图章文档写入与几何时间分开,用户实拍确认可拖动。本机正式安装和 88 安装包已验收;接续实现取样与覆盖区域独立跟踪及缩放后再发 Release。 |
| 2026-11-06 | 图章跳动闪烁与逐帧跟踪预览 | 1.14.3(94)正式安装和发布。图章与矩形蒙版实拍双向跟踪、轨迹回读、进度和取样连续性通过验收。 |
| 2026-11-06 | 1.14.3 更新到站点文章 | 原文已发布新版本,绑定界面原图、新封面和 94 版主下载包。前台 SEO、原图与封面、商业字段和完整下载均已核验。 |
| 2026-11-06 | 复核分发后的完整性失败 | 核实 94 包四个资源的落盘权限并复现严格验签失败。95 版修正权限、缩小启动检查范围并加入打包权限检查。现场证书链和宿主核验见上。 |
| 2026-11-06 | 更新文章 15792 的正式包 | 原文章下载替换为 95 版,发布修复和重装提醒。前台和站内下载完整校验通过。 |
| 2026-11-06 | 深色默认、独立效果与水平校正 | 1.15.0(96)已正式安装、宿主渲染通过并验包。两款独立效果可添加模块。实窗手动画线待复核。 |