Fix primary CST working domains and delayed output; 581 checks pass; seed new effects explicitly
这个提交包含在:
1 父节点
d5aba63b4e
当前提交
072bf881b9
16 个文件已更改
+452
-22
没有与搜索条件相匹配的文件
+10
-1
@@ -89,7 +89,10 @@ def build(model):
|
||||
flags='12884901888' if pid=='9000' else '12889161776'
|
||||
param=E.SubElement(filt,'parameter',name=name,id=pid,flags=flags)
|
||||
E.SubElement(param,'numberOfKeypoints').text='0'
|
||||
E.SubElement(param,'defaultVal').text=text;E.SubElement(param,'dataValue').text=text
|
||||
E.SubElement(param,'defaultVal').text=text
|
||||
# Explicit instance seed; registered defaults stay legacy for old projects.
|
||||
seeded=model.get('newEffectArchivesBase64',{}).get(pid)
|
||||
E.SubElement(param,'dataValue').text=custom_archive(seeded)[0] if seeded else text
|
||||
for row in model['parameters']:
|
||||
value=format(float(row['default']),'.17g')
|
||||
host_default=format(float(row.get('hostDefault',row['default'])),'.17g')
|
||||
@@ -130,6 +133,12 @@ def verify(data,model):
|
||||
assert params["10005"].get("value")=="1" and params["10005"].get("flags")=="8589934592" and f.get("pluginVersion")=="0"
|
||||
for row in model['parameters']:
|
||||
p=params[str(row['pid'])];assert float(p.get('default'))==float(row.get('hostDefault',row['default'])) and float(p.get('value'))==float(row['default'])
|
||||
for pid in ['9000','9001','9002']:
|
||||
original=custom_archive(model['archivesBase64'][pid])[0]
|
||||
seed=model.get('newEffectArchivesBase64',{}).get(pid)
|
||||
assert params[pid].findtext('defaultVal')==original
|
||||
assert params[pid].findtext('dataValue')==(custom_archive(seed)[0] if seed else original)
|
||||
assert params['9001'].findtext('defaultVal')!=params['9001'].findtext('dataValue')
|
||||
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'
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Build a controlled Log-code carrier fixture; never edit an FCP library.
|
||||
|
||||
The 16-bit PNG explicitly carries sRGB metadata so RGB_LINEAR host pixels can be
|
||||
unwrapped with the plugin's existing carrier. It is not raw-camera verification.
|
||||
"""
|
||||
import argparse, base64, json, plistlib, struct, uuid, zlib
|
||||
from pathlib import Path
|
||||
import xml.etree.ElementTree as E
|
||||
|
||||
root = Path(__file__).resolve().parent.parent
|
||||
p = argparse.ArgumentParser(description=__doc__)
|
||||
p.add_argument('--diagnostic', type=Path, required=True)
|
||||
args = p.parse_args()
|
||||
fixture = json.loads(args.diagnostic.read_text())
|
||||
qa = Path.home() / 'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa'
|
||||
qa.mkdir(parents=True, exist_ok=True)
|
||||
width, height = 1920, 1080
|
||||
|
||||
def chunk(name, data):
|
||||
return struct.pack('>I', len(data)) + name + data + struct.pack('>I', zlib.crc32(name + data) & 0xffffffff)
|
||||
|
||||
row = bytearray(b'\0')
|
||||
for x in range(width):
|
||||
code = fixture['patches'][x * 8 // width]['code']
|
||||
row += struct.pack('>HHH', *(round(max(0, min(1, v)) * 65535) for v in code))
|
||||
chart = qa / 'primary-slog3-code-carrier.png'
|
||||
chart.write_bytes(b'\x89PNG\r\n\x1a\n'
|
||||
+ chunk(b'IHDR', struct.pack('>IIBBBBB', width, height, 16, 2, 0, 0, 0))
|
||||
+ chunk(b'sRGB', b'\0') + chunk(b'gAMA', struct.pack('>I', 45455))
|
||||
+ chunk(b'IDAT', zlib.compress(bytes(row) * height)) + chunk(b'IEND', b''))
|
||||
model = json.loads((root / 'template/sources/RegisteredParameters.json').read_text())
|
||||
values = {r['key']: r['default'] for r in model['parameters']}
|
||||
values.update(cmConfigured=1, cmexposure=-4, skinEnabled=0)
|
||||
base = json.loads((qa / 'cms-authored-v2-before.json').read_text())
|
||||
preset = dict(format='com.dayu.color.preset', version=7,
|
||||
colorManagement=dict(version=3, mode=4, engine='Dayu-CST-f32', config='primary-parameters-v1'),
|
||||
values=values, paths={}, spider=base['spider'],
|
||||
tools=base64.b64encode(plistlib.dumps(dict(schema=2, layers=[], baseMasks={}), fmt=plistlib.FMT_BINARY)).decode())
|
||||
(qa / 'primary-host-minus4.json').write_text(json.dumps(preset, ensure_ascii=False, indent=2) + '\n')
|
||||
xml = E.Element('fcpxml', version='1.12')
|
||||
r = E.SubElement(xml, 'resources')
|
||||
E.SubElement(r, 'format', id='f1', width=str(width), height=str(height), frameDuration='1/25s', colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(r, 'format', id='f2', width=str(width), height=str(height), name='FFVideoFormatRateUndefined')
|
||||
a = E.SubElement(r, 'asset', id='a1', name='SLog3 控制码值', start='0s', duration='0s', format='f2', hasVideo='1', videoSources='1')
|
||||
E.SubElement(a, 'media-rep', kind='original-media', src=chart.as_uri())
|
||||
template = Path.home() / 'Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef'
|
||||
E.SubElement(r, 'effect', id='fx', name='大鱼调色', uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef', src=template.as_uri())
|
||||
event = E.SubElement(E.SubElement(xml, 'library'), 'event', name='大鱼调色_1.8.1_CST修正验收', uid=str(uuid.uuid4()).upper())
|
||||
for title in ['1.8.1_Log高光恢复', '1.8.1_工作空间与独立层']:
|
||||
project = E.SubElement(event, 'project', name=title, uid=str(uuid.uuid4()).upper())
|
||||
sequence = E.SubElement(project, 'sequence', format='f1', duration='4s', tcStart='0s', tcFormat='NDF', audioLayout='stereo', audioRate='48k')
|
||||
clip = E.SubElement(E.SubElement(sequence, 'spine'), 'video', ref='a1', name=title, offset='0s', start='0s', duration='4s')
|
||||
E.SubElement(clip, 'filter-video', ref='fx', name='大鱼调色', enabled='1')
|
||||
E.indent(xml)
|
||||
output = qa / '大鱼调色_1.8.1_CST修正验收.fcpxml'
|
||||
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n' + E.tostring(xml, encoding='unicode') + '\n')
|
||||
(qa / 'primary-host-reference.json').write_text(json.dumps(fixture, ensure_ascii=False, indent=2) + '\n')
|
||||
print(output)
|
||||
在新工单中引用
屏蔽一个用户