davinci-resolve-mcp 2.191.0 → 2.193.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +59 -0
- package/README.md +1 -1
- package/README.zh-CN.md +2 -2
- package/docs/reference/api-limitations.md +2 -2
- package/install.py +1 -1
- package/package.json +1 -1
- package/resolve-advanced/server/editorial.mjs +148 -9
- package/resolve-advanced/server/prproj.mjs +12 -2
- package/resolve-advanced/server/tools/editorial.mjs +5 -2
- package/resolve-advanced/vendor/drt-format/drt-parser.js +32 -10
- package/src/granular/common.py +1 -1
- package/src/server.py +1 -1
- package/src/utils/api_truth.py +14 -4
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,65 @@
|
|
|
2
2
|
|
|
3
3
|
Release history for the DaVinci Resolve MCP Server. The latest release is summarized in the root README; older entries live here to keep the README focused.
|
|
4
4
|
|
|
5
|
+
## What's New in v2.193.0 — E141: relink-aware changelist
|
|
6
|
+
|
|
7
|
+
### Added
|
|
8
|
+
|
|
9
|
+
- **`turnover_changelist` is relink-aware.** A real offline→online turnover
|
|
10
|
+
(the Premiere REEL_02 pix-lock against the Resolve conform of the same reel)
|
|
11
|
+
paired 15 of 228 cuts: the offline media was named `… 4K-2K … .mov`
|
|
12
|
+
(proxies) where the online cut used `… 4K … .mov` (masters) and `.mp4`
|
|
13
|
+
became `.mov`, so 203 identical cuts read as `replaced`. Now `sourceAliases`
|
|
14
|
+
(`{from,to}` exact or `{pattern,replace}` regex) rename old sources before
|
|
15
|
+
pairing, and a systematic rename is INFERRED from unpaired cuts that share
|
|
16
|
+
a record window — adopted only when one-to-one both ways and either
|
|
17
|
+
recurring or clearly the same name (LCS similarity ≥ 0.6), so a different
|
|
18
|
+
shot dropped into the same window stays `replaced`. The result reports
|
|
19
|
+
every alias with its cut count, similarity and whether it was inferred.
|
|
20
|
+
- **A per-source timecode rebase is not N trims.** Masters carry a different
|
|
21
|
+
timecode base than the proxies: the same cuts read as `trimmed` by one
|
|
22
|
+
constant shift. When one shift is a source's dominant story (≥2 cuts and
|
|
23
|
+
more than half of its differing cuts) the compare reads old through it and
|
|
24
|
+
reports it in `sourceTcOffsets`; a cut that still differs is a real trim on
|
|
25
|
+
top of the rebase, with the pre-rebase window kept in its deltas. A source
|
|
26
|
+
whose cuts each shift by a different amount (an eye-matched re-conform onto
|
|
27
|
+
other media) stays trims — measured: two of seven cuts sharing a shift is a
|
|
28
|
+
coincidence, not a base.
|
|
29
|
+
- **Premiere synthetic items name themselves.** A Universal Counting Leader
|
|
30
|
+
or Black Video has no file: its `Media` writes a bare numeric id as the
|
|
31
|
+
path and the human name in `<Title>`. They now read by title and carry
|
|
32
|
+
`generatorName`, so they pair with the online cut's generators by name
|
|
33
|
+
instead of reporting a numeric id replaced.
|
|
34
|
+
|
|
35
|
+
On the real reel: 189 of 228 cuts retained (was 15), 16 aliases inferred, one
|
|
36
|
+
source rebased by 47745 frames, symmetric in both directions; what remains is
|
|
37
|
+
the conform's own story — 27 trims, 10 junctions moved inside dissolves, the
|
|
38
|
+
online reel's second mix track, its reversed tail leader and frozen black.
|
|
39
|
+
|
|
40
|
+
## What's New in v2.192.0 — E140: a .drt retime decodes to its speed
|
|
41
|
+
|
|
42
|
+
### Added
|
|
43
|
+
|
|
44
|
+
- **A `.drt` retime decodes to its speed.** The keyed `MediaTimemapBA`
|
|
45
|
+
(`Sm2TimeMap`) that E139 could only flag now reads through the DRP library's
|
|
46
|
+
`decodeTimemap`, the same reader the `.drp` side uses: the keyframe slope is
|
|
47
|
+
the speed ratio, `XMax 60000` with a zero slope is the freeze sentinel, a
|
|
48
|
+
negative slope is a reverse. The parser's `timemap` becomes an object
|
|
49
|
+
(`kind` linear | linear-multi | constant | variable | freeze | unknown,
|
|
50
|
+
`speed`, `reverse`, durations, ramp `segments`), and a DRT event carries
|
|
51
|
+
`speed` in the percent every other parser speaks with `srcOut` following the
|
|
52
|
+
record window at that speed; a freeze is the zero-speed in==out event; a map
|
|
53
|
+
the decoder cannot read stays `speed`/`srcOut` null + `retimeUnknown`, never
|
|
54
|
+
a faked 100%. Measured on the real REEL_02 export: all four retimed clips
|
|
55
|
+
read 80, and their `srcOut` lands frame for frame on what Premiere wrote for
|
|
56
|
+
the same cuts (42423, 41949, 42178, 42178); the Black Video generator reads
|
|
57
|
+
as a freeze; the tail leader reads as a reverse; nothing is left unknown.
|
|
58
|
+
|
|
59
|
+
### Measured (filed in api-limitations)
|
|
60
|
+
|
|
61
|
+
- A 19.1.3.7 EXPORT_DRT writes `KeyframesBA` in the protobuf point form, not
|
|
62
|
+
the keyed-dict form its XMEML retime import writes; both decode.
|
|
63
|
+
|
|
5
64
|
## What's New in v2.191.0 — E139: a .drt timeline walks into events; two Resolve versions diff
|
|
6
65
|
|
|
7
66
|
### Added
|
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
English | [简体中文](README.zh-CN.md)
|
|
4
4
|
|
|
5
|
-
[](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
|
|
6
6
|
[](https://www.npmjs.com/package/davinci-resolve-mcp)
|
|
7
7
|
[](docs/reference/api-coverage.md)
|
|
8
8
|
[-blue.svg)](#server-modes)
|
package/README.zh-CN.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
[English](README.md) | 简体中文
|
|
4
4
|
|
|
5
|
-
[](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
|
|
6
6
|
[](https://www.npmjs.com/package/davinci-resolve-mcp)
|
|
7
7
|
[](docs/reference/api-coverage.md)
|
|
8
8
|
[-blue.svg)](#服务器模式)
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
[](https://www.python.org/downloads/)
|
|
13
13
|
[](https://opensource.org/licenses/MIT)
|
|
14
14
|
|
|
15
|
-
> 本翻译对应 v2.
|
|
15
|
+
> 本翻译对应 v2.193.0 版 README。如与英文原版有出入,以 [英文原版](README.md) 为准。
|
|
16
16
|
|
|
17
17
|
一个 Model Context Protocol (MCP) 服务器,让 AI 助手通过官方脚本 API 控制 DaVinci Resolve Studio(达芬奇)。它提供完整的 API 覆盖,外加带护栏的工作流助手,涵盖剪辑、媒体池整理、渲染设置、审阅标记、调色、Fusion、Fairlight、项目生命周期任务、扩展开发,以及不碰源媒体的媒体分析。
|
|
18
18
|
|
|
@@ -305,8 +305,8 @@ equivalent, blocking full automation.
|
|
|
305
305
|
|
|
306
306
|
- **Object:** `Timeline`
|
|
307
307
|
- **Signature:** `(filePath, EXPORT_DRT) -> bool`
|
|
308
|
-
- **Behavior:** Measured on a Studio 19.1.3.7 export of a 229-clip reel (E139). A SeqContainer clip (Sm2TiVideoClip / Sm2TiAudioClip) carries its record window as <Start> and <Duration> (frames, absolute), its SOURCE in-point as <In> (frames) — written EMPTY (<In/>) on every audio clip and on generator tails — <MediaFilePath>, <MediaStartTime> (seconds), <MediaFrameRate> as a 16-hex blob = one little-endian IEEE double + 8 pad bytes (24.0 = 0000000000003840…), and <MediaTimemapBA>: tag byte 0x02 + one double (the media length in seconds) on a 100% clip, a keyed
|
|
309
|
-
- **Workaround / current handling:** Read record timing from Start/Duration, source in from In (null when empty — do not fake 0 silently), fps and start from the pool sequence (frames = round(seconds × fps));
|
|
308
|
+
- **Behavior:** Measured on a Studio 19.1.3.7 export of a 229-clip reel (E139). A SeqContainer clip (Sm2TiVideoClip / Sm2TiAudioClip) carries its record window as <Start> and <Duration> (frames, absolute), its SOURCE in-point as <In> (frames) — written EMPTY (<In/>) on every audio clip and on generator tails — <MediaFilePath>, <MediaStartTime> (seconds), <MediaFrameRate> as a 16-hex blob = one little-endian IEEE double + 8 pad bytes (24.0 = 0000000000003840…), and <MediaTimemapBA>: tag byte 0x02 + one double (the media length in seconds) on a 100% clip, a keyed Sm2TimeMap opening 00000001… on a retimed clip and on generators — its KeyframesBA is the protobuf point form (NOT the keyed-dict form a 19.1.3.7 XMEML retime import writes) and decodes with the DRP library's decodeTimemap: the keyframe slope is the speed (0.79999 on all four retimed clips of a real reel = Premiere's 80 for the same cuts, srcOut = In + round(Duration × 0.8) matching Premiere's frame for frame), XMax 60000 with a zero slope is the freeze sentinel (a Black Video generator), a negative slope is a reverse (a reversed tail leader). An Sm2TiTransition sits in the same <Items> list as the clips with <Start>/<Duration> (its span), <PrettyType> (Cross Dissolve), <AlignmentType> and <Position>: type 2 centres the span on the cut, type 3 ends it at the cut (11/11 witnessed against the clip edges; the one-sided 8-frame fade-in is type 3 / Position 1). The container carries NO frame rate, start or resolution — they live in the pool folder's embedded Sm2Sequence: <FrameRate> (LE double blob), <MediaExtents> = two LE doubles, record start SECONDS then duration SECONDS (7192.0 → frame 172608 = 01:59:52:00 at 24), <Resolution> = two big-endian uint64, width then height.
|
|
309
|
+
- **Workaround / current handling:** Read record timing from Start/Duration, source in from In (null when empty — do not fake 0 silently), fps and start from the pool sequence (frames = round(seconds × fps)); decode a keyed timemap to its speed (E140) and report a map the decoder cannot read as speed null rather than 100%. The parser exposes these and editorial.parse_interchange {format:'drt', content: PATH} walks one timeline into normalized events so two timeline versions diff through turnover_changelist (v19 vs v20 of a real reel: identical, 229 of 229 retained).
|
|
310
310
|
- **Tags:** timeline, export, drt, interchange
|
|
311
311
|
|
|
312
312
|
### Timeline.Export EXPORT_EDL (video-only, reel AX, clip-name comments)
|
package/install.py
CHANGED
|
@@ -37,7 +37,7 @@ from src.utils.update_check import (
|
|
|
37
37
|
|
|
38
38
|
# ─── Version ──────────────────────────────────────────────────────────────────
|
|
39
39
|
|
|
40
|
-
VERSION = "2.
|
|
40
|
+
VERSION = "2.193.0"
|
|
41
41
|
# Only hard floor: mcp[cli] requires Python 3.10+. There is no upper bound —
|
|
42
42
|
# Resolve's scripting bridge loads into newer interpreters on recent builds
|
|
43
43
|
# (Python 3.14 verified against Resolve Studio 20.3.2). Older Resolve builds
|
package/package.json
CHANGED
|
@@ -622,7 +622,9 @@ export function parseInterchange(format, content, opts = {}) {
|
|
|
622
622
|
* <Start>/<Duration>, its source in-point <In> (EMPTY on audio clips and on
|
|
623
623
|
* generator tails — reported srcInAbsent, never faked to 0 silently), its
|
|
624
624
|
* media <MediaFilePath>; <MediaTimemapBA> tag 0x02 = linear 100%, a keyed
|
|
625
|
-
*
|
|
625
|
+
* Sm2TimeMap decodes to the speed (E140: constant 80% on a real reel's four
|
|
626
|
+
* retimes = Premiere's 80; XMax 60000 + zero slope = freeze; negative = reverse;
|
|
627
|
+
* an unreadable map stays speed null + retimeUnknown);
|
|
626
628
|
* Sm2TiTransition alignment 2 centres on the cut, 3 ends at it. Record
|
|
627
629
|
* positions are sequence-relative (start frame subtracted), like every other
|
|
628
630
|
* parser here; `startFrame` is returned beside the events.
|
|
@@ -651,16 +653,27 @@ export function drtEventsFromParsed(parsed, opts = {}) {
|
|
|
651
653
|
const srcIn = c.in != null ? c.in : 0;
|
|
652
654
|
const media = c.mediaFilePath || null;
|
|
653
655
|
const isGen = !media && !c.compound;
|
|
656
|
+
// E140: the decoded Sm2TimeMap gives the speed. A ratio becomes the
|
|
657
|
+
// percent every other parser speaks (0.8 → 80); the source OUT follows
|
|
658
|
+
// the record window at that speed (37 record frames × 0.8 = 30 source
|
|
659
|
+
// frames — the same srcOut Premiere wrote for the same cut); a freeze
|
|
660
|
+
// is the zero-speed in==out event the other parsers emit; a map the
|
|
661
|
+
// decoder could not read stays speed/srcOut null + retimeUnknown.
|
|
662
|
+
const tm = c.timemap && typeof c.timemap === 'object' ? c.timemap : null;
|
|
663
|
+
const kind = tm ? tm.kind : (c.timemap === 'curve' ? 'unknown' : 'linear');
|
|
664
|
+
let speed = 100, srcOut = srcIn + c.duration, unknown = false;
|
|
665
|
+
if (kind === 'freeze') { speed = 0; srcOut = srcIn; }
|
|
666
|
+
else if (kind === 'constant' || kind === 'variable') { speed = Math.round(tm.speed * 10000) / 100; srcOut = srcIn + Math.round(c.duration * tm.speed); }
|
|
667
|
+
else if (kind === 'unknown') { speed = null; srcOut = null; unknown = true; }
|
|
654
668
|
const ev = {
|
|
655
669
|
index: index++, track: label, source: media ? base(media, c.name) : (c.name || 'BL'),
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
srcIn, srcOut: c.timemap === 'curve' ? null : srcIn + c.duration, recIn: c.start - startFrame, recOut: c.start - startFrame + c.duration,
|
|
659
|
-
speed: c.timemap === 'curve' ? null : 100, reverse: false, transition: null, fps,
|
|
670
|
+
srcIn, srcOut, recIn: c.start - startFrame, recOut: c.start - startFrame + c.duration,
|
|
671
|
+
speed, reverse: Boolean(tm && tm.reverse), transition: null, fps,
|
|
660
672
|
};
|
|
661
673
|
if (media) ev.sourcePath = media;
|
|
662
674
|
if (c.in == null) ev.srcInAbsent = true;
|
|
663
|
-
if (
|
|
675
|
+
if (unknown) ev.retimeUnknown = true;
|
|
676
|
+
if (kind === 'variable') { ev.variableSpeed = true; ev.retimeSegments = tm.segments; }
|
|
664
677
|
if (c.compound) ev.compound = c.compound;
|
|
665
678
|
if (isGen) ev.generatorName = c.name || null;
|
|
666
679
|
events.push(ev);
|
|
@@ -824,7 +837,11 @@ function pairEvents(oldEvents, newEvents, recTol = 1) {
|
|
|
824
837
|
|
|
825
838
|
/**
|
|
826
839
|
* Diff two normalized event lists → a SHAPE verdict (identical|subset|superset|edit, E138)
|
|
827
|
-
* plus per-event {kind: moved|retimed|trimmed|replaced|new|gone}
|
|
840
|
+
* plus per-event {kind: moved|retimed|trimmed|replaced|new|gone}; RELINK-aware (E141):
|
|
841
|
+
* opts.sourceAliases ({from,to} | {pattern,replace}) rename old sources first, a
|
|
842
|
+
* systematic rename is inferred from same-window unpaired cuts (opts.inferAliases
|
|
843
|
+
* !== false) and reported in sourceAliases, and a constant per-source source-window
|
|
844
|
+
* shift witnessed on ≥2 cuts is a TC rebase (sourceTcOffsets), not trims.
|
|
828
845
|
* PLUS per-junction {kind: transition_added|transition_dropped|transition_changed}
|
|
829
846
|
* (fade 'in'/'out' or null for a dissolve). Zero-length carrier lines and the
|
|
830
847
|
* black legs that carry fades fold into the junction diff instead of reading
|
|
@@ -834,7 +851,94 @@ function pairEvents(oldEvents, newEvents, recTol = 1) {
|
|
|
834
851
|
* @param {Array} newEvents
|
|
835
852
|
* @param {{recTolerance?:number}} [opts]
|
|
836
853
|
*/
|
|
854
|
+
// ── RELINK awareness (E141) ────────────────────────────────────────────
|
|
855
|
+
// A real offline→online turnover (Premiere REEL_02 → the Resolve conform of
|
|
856
|
+
// the same reel) paired 15 of 228 cuts: the offline media was named
|
|
857
|
+
// "… 4K-2K … .mov" (proxies) where the online cut used "… 4K … .mov"
|
|
858
|
+
// (masters) and ".mp4" became ".mov", so 203 identical cuts read as
|
|
859
|
+
// `replaced`; and the masters carry a different timecode base, so the same
|
|
860
|
+
// cuts read as `trimmed` by a constant per-source shift. Neither is an edit.
|
|
861
|
+
const normalizeAliases = (list) => (Array.isArray(list) ? list : []).map((a) => {
|
|
862
|
+
if (!a || typeof a !== 'object') throw new Error('sourceAliases: each entry is {from,to} or {pattern,replace}');
|
|
863
|
+
if (a.pattern != null) return { pattern: String(a.pattern), replace: String(a.replace ?? ''), re: new RegExp(a.pattern, a.flags || 'g'), inferred: false };
|
|
864
|
+
if (a.from != null && a.to != null) return { from: String(a.from), to: String(a.to), inferred: false };
|
|
865
|
+
throw new Error('sourceAliases: each entry is {from,to} or {pattern,replace}');
|
|
866
|
+
});
|
|
867
|
+
const aliasSource = (src, aliases) => {
|
|
868
|
+
let s = String(src ?? '');
|
|
869
|
+
for (const a of aliases) {
|
|
870
|
+
if (a.re) s = s.replace(a.re, a.replace);
|
|
871
|
+
else if (s === a.from) s = a.to;
|
|
872
|
+
}
|
|
873
|
+
return s;
|
|
874
|
+
};
|
|
875
|
+
const applyAliases = (events, aliases) => (aliases.length
|
|
876
|
+
? events.map((e) => { const s = aliasSource(e.source, aliases); return s === String(e.source ?? '') ? e : { ...e, source: s, aliasedFrom: e.source }; })
|
|
877
|
+
: events);
|
|
878
|
+
// Longest-common-subsequence ratio, case-insensitive: 1 = identical names.
|
|
879
|
+
function nameSimilarity(a, b) {
|
|
880
|
+
const x = String(a || '').toLowerCase(), y = String(b || '').toLowerCase();
|
|
881
|
+
if (!x.length || !y.length) return 0;
|
|
882
|
+
let prev = new Array(y.length + 1).fill(0);
|
|
883
|
+
for (let i = 1; i <= x.length; i++) {
|
|
884
|
+
const cur = new Array(y.length + 1).fill(0);
|
|
885
|
+
for (let j = 1; j <= y.length; j++) cur[j] = x[i - 1] === y[j - 1] ? prev[j - 1] + 1 : Math.max(prev[j], cur[j - 1]);
|
|
886
|
+
prev = cur;
|
|
887
|
+
}
|
|
888
|
+
return (2 * prev[y.length]) / (x.length + y.length);
|
|
889
|
+
}
|
|
890
|
+
/**
|
|
891
|
+
* Infer a systematic RENAME from the cuts a first pass could not pair: an
|
|
892
|
+
* unpaired old cut and an unpaired new cut on the same track with the same
|
|
893
|
+
* record window are the same cut under two names. An alias is adopted when
|
|
894
|
+
* the mapping is one-to-one both ways and either recurs (≥2 cuts) or the two
|
|
895
|
+
* names are clearly the same name (LCS similarity ≥ 0.6) — a genuinely
|
|
896
|
+
* different shot dropped into the same window is neither.
|
|
897
|
+
*/
|
|
898
|
+
function inferSourceAliases(P, recTol) {
|
|
899
|
+
const cands = new Map(); // from -> Map(to -> count)
|
|
900
|
+
const usedNew = new Set();
|
|
901
|
+
for (const oe of P.unmatchedOld) {
|
|
902
|
+
const hit = P.unmatchedNew.find((ne) => !usedNew.has(ne) && ne.track === oe.track
|
|
903
|
+
&& Math.abs((ne.recIn ?? 0) - (oe.recIn ?? 0)) <= recTol && Math.abs((ne.recOut ?? 0) - (oe.recOut ?? 0)) <= recTol);
|
|
904
|
+
if (!hit) continue;
|
|
905
|
+
usedNew.add(hit);
|
|
906
|
+
const from = String(oe.source ?? ''), to = String(hit.source ?? '');
|
|
907
|
+
if (from === to) continue;
|
|
908
|
+
if (!cands.has(from)) cands.set(from, new Map());
|
|
909
|
+
cands.get(from).set(to, (cands.get(from).get(to) || 0) + 1);
|
|
910
|
+
}
|
|
911
|
+
const claimed = new Map(); // to -> from
|
|
912
|
+
const out = [];
|
|
913
|
+
for (const [from, tos] of cands) {
|
|
914
|
+
if (tos.size !== 1) continue;
|
|
915
|
+
const [to, count] = [...tos][0];
|
|
916
|
+
if (claimed.has(to) && claimed.get(to) !== from) continue;
|
|
917
|
+
const similarity = Math.round(nameSimilarity(from, to) * 1000) / 1000;
|
|
918
|
+
if (count >= 2 || similarity >= 0.6) { claimed.set(to, from); out.push({ from, to, cuts: count, similarity, inferred: true }); }
|
|
919
|
+
}
|
|
920
|
+
// A 'to' claimed by two different 'from's is ambiguous — drop both.
|
|
921
|
+
const toCounts = new Map(); for (const a of out) toCounts.set(a.to, (toCounts.get(a.to) || 0) + 1);
|
|
922
|
+
return out.filter((a) => toCounts.get(a.to) === 1);
|
|
923
|
+
}
|
|
924
|
+
|
|
837
925
|
export function diffChangelist(oldEvents, newEvents, opts = {}) {
|
|
926
|
+
const explicit = normalizeAliases(opts.sourceAliases);
|
|
927
|
+
let aliases = explicit;
|
|
928
|
+
let result = diffChangelistOnce(applyAliases(oldEvents, aliases), newEvents, opts);
|
|
929
|
+
if (opts.inferAliases !== false) {
|
|
930
|
+
const inferred = inferSourceAliases(result.__P, opts.recTolerance ?? 1);
|
|
931
|
+
if (inferred.length) {
|
|
932
|
+
aliases = [...explicit, ...inferred];
|
|
933
|
+
result = diffChangelistOnce(applyAliases(oldEvents, aliases), newEvents, opts);
|
|
934
|
+
}
|
|
935
|
+
}
|
|
936
|
+
const { __P, ...out } = result;
|
|
937
|
+
out.sourceAliases = aliases.map((a) => (a.re ? { pattern: a.pattern, replace: a.replace, inferred: false } : { from: a.from, to: a.to, inferred: Boolean(a.inferred), ...(a.cuts != null ? { cuts: a.cuts, similarity: a.similarity } : {}) }));
|
|
938
|
+
return out;
|
|
939
|
+
}
|
|
940
|
+
|
|
941
|
+
function diffChangelistOnce(oldEvents, newEvents, opts = {}) {
|
|
838
942
|
const recTol = opts.recTolerance ?? 1;
|
|
839
943
|
const changes = [];
|
|
840
944
|
// COMPOUND FORMS (E124): a compound is one collapsed item in an XML cut
|
|
@@ -860,10 +964,41 @@ export function diffChangelist(oldEvents, newEvents, opts = {}) {
|
|
|
860
964
|
}
|
|
861
965
|
const P = pairEvents(oldEvents.filter((e) => !skipOld.has(e)), newEvents.filter((e) => !skipNew.has(e)), recTol);
|
|
862
966
|
|
|
967
|
+
// TC REBASE (E141): when every differing cut of a source shifts its source
|
|
968
|
+
// window by the SAME amount in and out, the media was relinked to a copy
|
|
969
|
+
// with a different timecode base (offline proxies at 0, masters at their
|
|
970
|
+
// camera TC) — not N trims. A shift witnessed on ≥2 cuts of a source is
|
|
971
|
+
// that source's offset; the compare below reads old through it, and a cut
|
|
972
|
+
// that still differs is a real trim on top of the rebase.
|
|
973
|
+
const shiftTally = new Map(), differing = new Map();
|
|
974
|
+
for (const { oe, ne } of P.pairs) {
|
|
975
|
+
if ([oe.srcIn, oe.srcOut, ne.srcIn, ne.srcOut].some((v) => v == null)) continue;
|
|
976
|
+
const dIn = ne.srcIn - oe.srcIn, dOut = ne.srcOut - oe.srcOut;
|
|
977
|
+
if (dIn === 0 && dOut === 0) continue;
|
|
978
|
+
const key = String(ne.source ?? '');
|
|
979
|
+
differing.set(key, (differing.get(key) || 0) + 1);
|
|
980
|
+
if (dIn === 0 || dIn !== dOut) continue;
|
|
981
|
+
if (!shiftTally.has(key)) shiftTally.set(key, new Map());
|
|
982
|
+
shiftTally.get(key).set(dIn, (shiftTally.get(key).get(dIn) || 0) + 1);
|
|
983
|
+
}
|
|
984
|
+
// A rebase is the source's DOMINANT story: the same shift on ≥2 cuts AND
|
|
985
|
+
// on more than half of the cuts whose windows differ at all. A source whose
|
|
986
|
+
// cuts each shift by a different amount (an eye-matched re-conform onto
|
|
987
|
+
// other media — measured: two of seven cuts happened to share a shift) is
|
|
988
|
+
// trims, not a base change.
|
|
989
|
+
const tcOffsets = new Map();
|
|
990
|
+
for (const [source, tally] of shiftTally) {
|
|
991
|
+
const [offset, cuts] = [...tally].sort((a, b) => b[1] - a[1])[0];
|
|
992
|
+
if (cuts >= 2 && cuts > (differing.get(source) || 0) / 2) tcOffsets.set(source, { source, offset, cuts, rebased: 0 });
|
|
993
|
+
}
|
|
994
|
+
|
|
863
995
|
const retained = [];
|
|
864
996
|
for (const { oe, ne } of P.pairs) {
|
|
865
997
|
const deltas = {};
|
|
866
998
|
let kind = 'unchanged';
|
|
999
|
+
const tc = tcOffsets.get(String(ne.source ?? ''));
|
|
1000
|
+
const off = tc ? tc.offset : 0;
|
|
1001
|
+
const oIn = oe.srcIn == null ? null : oe.srcIn + off, oOut = oe.srcOut == null ? null : oe.srcOut + off;
|
|
867
1002
|
if (Math.abs((oe.speed ?? 100) - (ne.speed ?? 100)) > 0.01 || Boolean(oe.reverse) !== Boolean(ne.reverse)) {
|
|
868
1003
|
kind = 'retimed';
|
|
869
1004
|
deltas.speed = { old: oe.speed, new: ne.speed };
|
|
@@ -871,9 +1006,11 @@ export function diffChangelist(oldEvents, newEvents, opts = {}) {
|
|
|
871
1006
|
} else if (Math.abs((oe.recIn ?? 0) - (ne.recIn ?? 0)) > recTol) {
|
|
872
1007
|
kind = 'moved';
|
|
873
1008
|
deltas.recIn = { old: oe.recIn, new: ne.recIn };
|
|
874
|
-
} else if ((
|
|
1009
|
+
} else if ((oIn ?? null) !== (ne.srcIn ?? null) || (oOut ?? null) !== (ne.srcOut ?? null)) {
|
|
875
1010
|
kind = 'trimmed';
|
|
876
|
-
deltas.src = { old: [
|
|
1011
|
+
deltas.src = { old: [oIn, oOut], new: [ne.srcIn, ne.srcOut], ...(off ? { tcOffset: off, oldBeforeRebase: [oe.srcIn, oe.srcOut] } : {}) };
|
|
1012
|
+
} else if (off && ((oe.srcIn ?? null) !== (ne.srcIn ?? null))) {
|
|
1013
|
+
tc.rebased += 1;
|
|
877
1014
|
}
|
|
878
1015
|
if (kind !== 'unchanged') changes.push({ kind, source: ne.source, track: ne.track, oldRecIn: oe.recIn, newRecIn: ne.recIn, deltas });
|
|
879
1016
|
else retained.push(ne);
|
|
@@ -959,7 +1096,9 @@ export function diffChangelist(oldEvents, newEvents, opts = {}) {
|
|
|
959
1096
|
transitions: { old: P.old.transitions.length, new: P.new.transitions.length },
|
|
960
1097
|
carriersFolded: { old: P.old.carriers.length, new: P.new.carriers.length },
|
|
961
1098
|
...shapeInfo,
|
|
1099
|
+
sourceTcOffsets: [...tcOffsets.values()].map((t) => ({ source: t.source, offset: t.offset, cuts: t.cuts, rebased: t.rebased })),
|
|
962
1100
|
gate: 'review',
|
|
1101
|
+
__P: P,
|
|
963
1102
|
};
|
|
964
1103
|
}
|
|
965
1104
|
|
|
@@ -189,15 +189,24 @@ function realClipSource(clipNode, byId) {
|
|
|
189
189
|
}
|
|
190
190
|
const ms = srcEntry && asArray(srcEntry.node.MediaSource)[0];
|
|
191
191
|
const media = ms && byId.get(ref(ms, 'Media') || '');
|
|
192
|
+
let generator = false;
|
|
192
193
|
if (media) {
|
|
193
194
|
const path = findFirstText(media.node, ['ActualMediaFilePath', 'FilePath', 'RelativePath'], 6);
|
|
194
|
-
|
|
195
|
+
// A synthetic Premiere item (Universal Counting Leader, Black Video, colour
|
|
196
|
+
// matte…) has NO file: its Media writes a bare numeric id as the path and
|
|
197
|
+
// carries the human name in <Title> (E141, measured: FilePath 1279607108 /
|
|
198
|
+
// Title "Universal Counting Leader"). Name it by the title and tag it a
|
|
199
|
+
// generator so a changelist pairs it with the online cut's generator by
|
|
200
|
+
// NAME instead of reporting a numeric id replaced.
|
|
201
|
+
const title = findFirstText(media.node, ['Title'], 3);
|
|
202
|
+
if (path && /^\d+$/.test(String(path).trim()) && title) { name = String(title); generator = true; }
|
|
203
|
+
else if (path) name = String(path).split(/[\\/]/).pop();
|
|
195
204
|
}
|
|
196
205
|
if (!name) {
|
|
197
206
|
const master = byId.get(ref(sub.node, 'MasterClip') || '');
|
|
198
207
|
name = (master && nodeName(master.node)) || nodeName(sub.node) || null;
|
|
199
208
|
}
|
|
200
|
-
return { inPt, outPt, name };
|
|
209
|
+
return { inPt, outPt, name, generator };
|
|
201
210
|
}
|
|
202
211
|
|
|
203
212
|
function clipEvent(clipNode, byId, track, fps, index) {
|
|
@@ -225,6 +234,7 @@ function clipEvent(clipNode, byId, track, fps, index) {
|
|
|
225
234
|
track,
|
|
226
235
|
source: (real && real.name) || resolveSourceName(clipNode, byId),
|
|
227
236
|
...(real && real.nestedSequence ? { __nested: real.nestedSequence } : {}),
|
|
237
|
+
...(real && real.generator ? { generatorName: real.name } : {}),
|
|
228
238
|
srcIn: reverse ? srcOut : srcIn,
|
|
229
239
|
srcOut: reverse ? srcIn : srcOut,
|
|
230
240
|
recIn,
|
|
@@ -68,6 +68,9 @@ const changelistSchema = z.object({
|
|
|
68
68
|
new: eventArray.describe('New (turnover) normalized events'),
|
|
69
69
|
recTolerance: z.number().optional(),
|
|
70
70
|
timingGuards: z.boolean().optional().describe('Also run the timing silent-lie guards (default true)'),
|
|
71
|
+
sourceAliases: z.array(z.object({ from: z.string().optional(), to: z.string().optional(), pattern: z.string().optional(), replace: z.string().optional(), flags: z.string().optional() })).optional()
|
|
72
|
+
.describe('Rename OLD sources before pairing (E141): {from,to} exact or {pattern,replace} regex — e.g. the offline "4K-2K" proxies vs the online "4K" masters. A systematic rename is also inferred automatically (inferAliases) and reported in sourceAliases.'),
|
|
73
|
+
inferAliases: z.boolean().optional().describe('Infer a systematic source rename from unpaired cuts that share a record window (default true)'),
|
|
71
74
|
});
|
|
72
75
|
|
|
73
76
|
const conformManifestSchema = z.object({
|
|
@@ -87,7 +90,7 @@ const markerSchema = z.object({
|
|
|
87
90
|
export const editorialTool = {
|
|
88
91
|
name: 'editorial',
|
|
89
92
|
description:
|
|
90
|
-
'Editorial integrity (Cluster E) — turnover interchange → normalized events → changelist + conform manifest with TIMING silent-lie guards (flattened retime / dropped J/L-cut audio / framerate-pulldown slip / reverse dropped / transition-handle starvation → flag, skip-not-fake). Report-only (gate: review). Actions: parse_interchange (EDL/OTIO/XMEML natively — incl. Resolve-written OTIO generator clips (a Solid Color is a Clip with a NULL media_reference; it walks as a BL leg with generatorName, and an OTIO GeneratorReference carries its colour) and nested OTIO Stacks (compound clips — Resolve\'s writer nests them with a trim window) FLATTEN into record time with fromCompound on each cut, so Resolve\'s own OTIO exports re-conform (its FCP7 XML writer flattens a compound to ONE media-less clipitem instead — tagged `compound`, which the bridge drops with a reason in unresolvedCompounds unless the sourceMap maps the compound name to a flattened media file), Resolve-written FCP7 -1 junction edges (paired in record order) + Solid Color / Color Matte generators carrying their `fillcolor` (BL legs with `color` → fade-to-white and colour mattes author, E110), XMEML audio-track transitionitems as audio cross-fades on numbered lanes A/A2/…, and CMX FROM/TO CLIP NAME comments over the generic AX reel — + AAF via pyaaf2 (flat sound/picture slots number A/A2/… and V/V2/… in slot order so separate beds keep their lanes; NestedScope layers keep layer numbering; a NESTED SEQUENCE used as a clip — a SourceClip referencing a named CompositionMob — flattens through its reference window with fromCompound, like OTIO Stacks) + PRPROJ via gunzip+XML (real Premiere 2025 files — uuid ObjectUID/ObjectURef graph, TrackGroups, ClipTrackItem→SubClip→VideoClip→MediaSource→Media chain, zeros written as absence — and the legacy ObjectID/VideoTracks shape both walk; measured on a 739-sequence turnover that used to list ZERO; a NESTED SEQUENCE used as a clip — Source = Video/AudioSequenceSource → Sequence — flattens through its in-point window with fromCompound, like OTIO Stacks and AAF nested compositions; 13,711 such events on one real reels project; real transitions live in the track\'s TransitionItems list — read alongside ClipItems, attached with their DisplayName as type, HasOutgoingClip/HasIncomingClip false = fade from/to black or silence; tracks number as lanes V/V2…/A/A2… and a flattened nested sequence\'s inner lanes first-fit above what the parent already stacks — laneShift records the shift; markers are the sequence\'s OWN, read from Premiere\'s DVAMarker JSON) → normalized events incl. span-explicit transitions, BL fade legs, and freezes as zero-speed events (OTIO FreezeFrame, XMEML timeremap 0, PrProj in==out, AAF 0% motion effects); for AAF/PRPROJ/DRT/DRP pass the file PATH as content; DRT/DRP walk ONE timeline (`timeline` = pool name or index; default the first timeline-kind container) into events with sequence-relative record positions + the returned startFrame/startTimecode/fps read from the pool sequence — <In> is the source in-point (EMPTY on real audio clips → srcInAbsent), a keyed MediaTimemapBA
|
|
93
|
+
'Editorial integrity (Cluster E) — turnover interchange → normalized events → changelist + conform manifest with TIMING silent-lie guards (flattened retime / dropped J/L-cut audio / framerate-pulldown slip / reverse dropped / transition-handle starvation → flag, skip-not-fake). Report-only (gate: review). Actions: parse_interchange (EDL/OTIO/XMEML natively — incl. Resolve-written OTIO generator clips (a Solid Color is a Clip with a NULL media_reference; it walks as a BL leg with generatorName, and an OTIO GeneratorReference carries its colour) and nested OTIO Stacks (compound clips — Resolve\'s writer nests them with a trim window) FLATTEN into record time with fromCompound on each cut, so Resolve\'s own OTIO exports re-conform (its FCP7 XML writer flattens a compound to ONE media-less clipitem instead — tagged `compound`, which the bridge drops with a reason in unresolvedCompounds unless the sourceMap maps the compound name to a flattened media file), Resolve-written FCP7 -1 junction edges (paired in record order) + Solid Color / Color Matte generators carrying their `fillcolor` (BL legs with `color` → fade-to-white and colour mattes author, E110), XMEML audio-track transitionitems as audio cross-fades on numbered lanes A/A2/…, and CMX FROM/TO CLIP NAME comments over the generic AX reel — + AAF via pyaaf2 (flat sound/picture slots number A/A2/… and V/V2/… in slot order so separate beds keep their lanes; NestedScope layers keep layer numbering; a NESTED SEQUENCE used as a clip — a SourceClip referencing a named CompositionMob — flattens through its reference window with fromCompound, like OTIO Stacks) + PRPROJ via gunzip+XML (real Premiere 2025 files — uuid ObjectUID/ObjectURef graph, TrackGroups, ClipTrackItem→SubClip→VideoClip→MediaSource→Media chain, zeros written as absence — and the legacy ObjectID/VideoTracks shape both walk; measured on a 739-sequence turnover that used to list ZERO; a NESTED SEQUENCE used as a clip — Source = Video/AudioSequenceSource → Sequence — flattens through its in-point window with fromCompound, like OTIO Stacks and AAF nested compositions; 13,711 such events on one real reels project; real transitions live in the track\'s TransitionItems list — read alongside ClipItems, attached with their DisplayName as type, HasOutgoingClip/HasIncomingClip false = fade from/to black or silence; tracks number as lanes V/V2…/A/A2… and a flattened nested sequence\'s inner lanes first-fit above what the parent already stacks — laneShift records the shift; markers are the sequence\'s OWN, read from Premiere\'s DVAMarker JSON) → normalized events incl. span-explicit transitions, BL fade legs, and freezes as zero-speed events (OTIO FreezeFrame, XMEML timeremap 0, PrProj in==out, AAF 0% motion effects); for AAF/PRPROJ/DRT/DRP pass the file PATH as content; DRT/DRP walk ONE timeline (`timeline` = pool name or index; default the first timeline-kind container) into events with sequence-relative record positions + the returned startFrame/startTimecode/fps read from the pool sequence — <In> is the source in-point (EMPTY on real audio clips → srcInAbsent), a keyed MediaTimemapBA Sm2TimeMap decodes to the speed (E140: the four retimed clips of a real reel read 80 — Premiere\'s 80 for the same cuts — with srcOut following the record window at that speed; XMax 60000 + zero slope = a freeze → the zero-speed in==out event; a negative slope = reverse; a map the decoder cannot read stays speed null + retimeUnknown, never faked to 100%), Sm2TiTransition alignment 2 centres on the cut and 3 ends at it — so two Resolve timeline VERSIONS diff through turnover_changelist (E139); AAF also returns per-sequence startTimecode/startFrame — build the timeline at THAT start, not the Resolve 01:00:00:00 default — and per-clip `geometry` for Avid transform effects), list_sequences (ONE offline picker entry point across xml/edl/otio/drt/drp/aaf/prproj → [{id,name,eventCount}], plus startTimecode/startFrame for AAF and nestedIn — an AAF composition another composition uses as a clip is NESTED in it; offer the parent, its cuts arrive flattened), convert_to_interchange (author OTIO/EDL/DRT Resolve CAN import from events or a parsed source; the EDL target writes CMX transition pairs incl. BL fades — the .prproj→Resolve conform bridge, no Premiere needed; editorial timing/transitions survive and per-clip effects/color do not. SPEED/REVERSE survive on the otio (LinearTimeWarp) and edl (M2) targets ONLY — this FLAT drt target flattens every retime to 100% forward and returns `flattened`/`flattenedCount` naming each event that lost one (`flattened` is always present on `drt`, empty when there were none); for a .drt that AUTHORS retimes/dissolves/multi-track/audio, use drt.assemble_from_interchange), turnover_changelist (diff old vs new → a SHAPE verdict first — identical | subset (new keeps some of old\'s cuts unchanged in place and nothing else: a patch/selects reel of the same cut, NOT N deletions; a real Premiere auto-save kept 3 of 335) | superset (the reverse) | edit — with retained/oldCuts/newCuts, `sparse` and the retainedWindows for subset/superset, a transition that vanished or appeared with the cuts it joins counting as a consequence not an edit; RELINK-AWARE (E141): sourceAliases ({from,to} | {pattern,replace}) rename old sources before pairing, a systematic rename is INFERRED from unpaired cuts sharing a record window (one-to-one, recurring or clearly the same name) and reported in sourceAliases — a real offline→online turnover paired 15 of 228 cuts until the "4K-2K" proxies aliased to the "4K" masters, then 186 — and a constant per-source source-window shift witnessed on ≥2 cuts is a TC REBASE (sourceTcOffsets), not trims; then moved/retimed/trimmed/replaced/new/gone PLUS the junction diff: transition_added/transition_dropped/transition_changed with fade in/out or dissolve, outgoing/incoming, span and duration/type/pre-roll deltas — zero-length CMX carrier lines and the BL legs that carry fades fold into the junction diff instead of reading as gone/new sources; events pair by closest record position, consumed once, so a source cut twice at two speeds compares instance to instance; + timing flags incl. transition_dropped and dropped_split_audio on any A-track; a compound seen collapsed in one cut and flattened in the other reports compound_collapsed/compound_expanded once, never replaced+gone), conform_manifest (per-event assert: source resolved/handles/retime/reverse/TC-base; BL-aware — black legs need no source, fades no black-side handles, and a fade-out tail requirement lands on the picture source; a compound clipitem fails source_resolved by NAME with the remedy — map it to a flattened file or turn over as OTIO), marker_roundtrip (markers with provenance tags), verify_roundtrip (input events vs re-export events -> pass/mismatches + fitted per-source TC offsets + marker compare w/ markersNotInExport honesty flag; FADE-AWARE: BL/Solid-Color legs merge out as blackSegments and fade-window boundary reshapes are excused into fadeReshapedBoundaries instead of failing; RETIME-AWARE: speed/reverse compare pairwise — EXPORT_OTIO carries an authored Sm2TimeMap back as LinearTimeWarp (measured), so a flattened/lost retime fails as drift geometry alone cannot catch; AUDIO-AWARE: declared audio events compare (a video-only export such as EXPORT_EDL flags audioNotInExport instead of failing) (channel legs deduped, mismatches tagged trackType audio) while the mirrored-A1 export of a video-only turnover stays informational; COLOUR-AWARE: an input generator leg carrying a fillcolor (fade-to-white, colour matte) must come back on the same track over its span with the same colour — Resolve\'s FCP7 writer emits it — else generator-colour fails (generatorColours reports the compare) — pass exportedFormat: an OTIO/EDL re-export cannot carry colour (measured) and reports generatorColourNotInExport instead of failing; COMPOUND-AWARE: an XML re-export that collapsed a compound to one clipitem over cuts the input flattened from that compound reports compoundsCollapsedInExport instead of count/source drift; the conform QC loop-closer). Offline (AAF needs pyaaf2; live AAF/DRP import is on the Python davinci-resolve MCP).',
|
|
91
94
|
async handler({ action, args }) {
|
|
92
95
|
if (action === 'parse_interchange') {
|
|
93
96
|
const p = parseSchema.parse(args);
|
|
@@ -147,7 +150,7 @@ export const editorialTool = {
|
|
|
147
150
|
}
|
|
148
151
|
if (action === 'turnover_changelist') {
|
|
149
152
|
const p = changelistSchema.parse(args);
|
|
150
|
-
const result = diffChangelist(p.old, p.new, { recTolerance: p.recTolerance });
|
|
153
|
+
const result = diffChangelist(p.old, p.new, { recTolerance: p.recTolerance, sourceAliases: p.sourceAliases, inferAliases: p.inferAliases });
|
|
151
154
|
if (p.timingGuards !== false) result.timing = timingGuards(p.old, p.new);
|
|
152
155
|
return result;
|
|
153
156
|
}
|
|
@@ -56,17 +56,39 @@ function beUint64(hex, offset = 0) {
|
|
|
56
56
|
const v = Number(Buffer.from(h.slice(offset, offset + 16), 'hex').readBigUInt64BE(0));
|
|
57
57
|
return Number.isFinite(v) ? v : null;
|
|
58
58
|
}
|
|
59
|
-
// <MediaTimemapBA
|
|
60
|
-
// double is the media length in seconds; a
|
|
61
|
-
//
|
|
62
|
-
//
|
|
63
|
-
|
|
59
|
+
// <MediaTimemapBA> (E139/E140): tag byte 0x02 + one double = a LINEAR (100%)
|
|
60
|
+
// clip whose double is the media length in seconds; a keyed Sm2TimeMap
|
|
61
|
+
// (00000001…) is a speed map. E140 decodes it through the DRP library's
|
|
62
|
+
// decodeTimemap (the same reader the .drp side uses): the keyframe slope is
|
|
63
|
+
// the speed ratio (0.8 on all four retimed clips of a real reel — Premiere's
|
|
64
|
+
// 80 for the same cuts), XMax 60000 with a zero slope is the FREEZE sentinel,
|
|
65
|
+
// a negative slope is a reverse. A map the decoder cannot read is 'unknown',
|
|
66
|
+
// never a faked 100%.
|
|
67
|
+
const FREEZE_XMAX_SENTINEL = 60000;
|
|
68
|
+
function decodeTimemapField(hex) {
|
|
64
69
|
const h = String(hex || '').replace(/[^0-9a-fA-F]/g, '').toLowerCase();
|
|
65
70
|
if (!h) return null;
|
|
66
|
-
if (h.startsWith('02')
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
71
|
+
if (h.startsWith('02')) {
|
|
72
|
+
return { form: 'identity', kind: h.length === 18 ? 'linear' : 'linear-multi', speed: 1, reverse: false };
|
|
73
|
+
}
|
|
74
|
+
let d;
|
|
75
|
+
try {
|
|
76
|
+
d = require('../drp-format/media-timemap').decodeTimemap(h);
|
|
77
|
+
} catch {
|
|
78
|
+
return { form: 'retimed', kind: 'unknown', speed: null, reverse: false };
|
|
79
|
+
}
|
|
80
|
+
if (!d || d.form !== 'retimed') return { form: 'retimed', kind: 'unknown', speed: null, reverse: false };
|
|
81
|
+
const slope = d.segments && d.segments.length ? d.segments[0].speed : null;
|
|
82
|
+
const base = { form: 'retimed', recordDurationSec: d.recordDurationSec ?? null, sourceDurationSec: d.sourceDurationSec ?? null };
|
|
83
|
+
if (d.recordDurationSec === FREEZE_XMAX_SENTINEL && slope === 0) return { ...base, kind: 'freeze', speed: 0, reverse: false };
|
|
84
|
+
if (!Number.isFinite(slope) || slope === 0 || Math.abs(slope) > 100) return { ...base, kind: 'unknown', speed: null, reverse: false };
|
|
85
|
+
return {
|
|
86
|
+
...base,
|
|
87
|
+
kind: d.variable ? 'variable' : 'constant',
|
|
88
|
+
speed: Math.abs(slope),
|
|
89
|
+
reverse: slope < 0,
|
|
90
|
+
...(d.variable ? { segments: d.segments } : {}),
|
|
91
|
+
};
|
|
70
92
|
}
|
|
71
93
|
// Sm2TiTransition alignment (E139, witnessed against the cut points of 11
|
|
72
94
|
// real dissolves): 2 = centred on the cut, 3 = ends at the cut (the
|
|
@@ -124,7 +146,7 @@ function extractClipsFromTrackXml(trackXml, trackType) {
|
|
|
124
146
|
in: inRaw === null || inRaw === '' ? null : (Number.isFinite(Number.parseInt(inRaw, 10)) ? Number.parseInt(inRaw, 10) : null),
|
|
125
147
|
mediaStartTime: mst === null || mst === '' ? null : (Number.isFinite(Number(mst)) ? Number(mst) : null),
|
|
126
148
|
mediaFrameRate: leDouble(extractScalar(inner, 'MediaFrameRate')),
|
|
127
|
-
timemap:
|
|
149
|
+
timemap: decodeTimemapField(extractScalar(inner, 'MediaTimemapBA')),
|
|
128
150
|
prettyType: extractScalar(inner, 'PrettyType') || null,
|
|
129
151
|
});
|
|
130
152
|
}
|
package/src/granular/common.py
CHANGED
|
@@ -87,7 +87,7 @@ if not logging.getLogger().handlers:
|
|
|
87
87
|
handlers=[logging.StreamHandler()],
|
|
88
88
|
)
|
|
89
89
|
|
|
90
|
-
VERSION = "2.
|
|
90
|
+
VERSION = "2.193.0"
|
|
91
91
|
logger = logging.getLogger("davinci-resolve-mcp")
|
|
92
92
|
logger.info(f"Starting DaVinci Resolve MCP Server v{VERSION}")
|
|
93
93
|
logger.info(f"Detected platform: {get_platform()}")
|
package/src/server.py
CHANGED
package/src/utils/api_truth.py
CHANGED
|
@@ -2743,8 +2743,17 @@ API_TRUTH: List[Dict[str, Any]] = [
|
|
|
2743
2743
|
"little-endian IEEE double + 8 pad bytes (24.0 = "
|
|
2744
2744
|
"0000000000003840…), and <MediaTimemapBA>: tag byte 0x02 + "
|
|
2745
2745
|
"one double (the media length in seconds) on a 100% clip, a "
|
|
2746
|
-
"keyed
|
|
2747
|
-
"generators
|
|
2746
|
+
"keyed Sm2TimeMap opening 00000001… on a retimed clip and on "
|
|
2747
|
+
"generators — its KeyframesBA is the protobuf point form "
|
|
2748
|
+
"(NOT the keyed-dict form a 19.1.3.7 XMEML retime import "
|
|
2749
|
+
"writes) and decodes with the DRP library's decodeTimemap: "
|
|
2750
|
+
"the keyframe slope is the speed (0.79999 on all four "
|
|
2751
|
+
"retimed clips of a real reel = Premiere's 80 for the same "
|
|
2752
|
+
"cuts, srcOut = In + round(Duration × 0.8) matching "
|
|
2753
|
+
"Premiere's frame for frame), XMax 60000 with a zero slope "
|
|
2754
|
+
"is the freeze sentinel (a Black Video generator), a "
|
|
2755
|
+
"negative slope is a reverse (a reversed tail leader). An "
|
|
2756
|
+
"Sm2TiTransition sits in the same <Items> "
|
|
2748
2757
|
"list as the clips with <Start>/<Duration> (its span), "
|
|
2749
2758
|
"<PrettyType> (Cross Dissolve), <AlignmentType> and "
|
|
2750
2759
|
"<Position>: type 2 centres the span on the cut, type 3 ends "
|
|
@@ -2759,8 +2768,9 @@ API_TRUTH: List[Dict[str, Any]] = [
|
|
|
2759
2768
|
"recommended": "Read record timing from Start/Duration, source in from "
|
|
2760
2769
|
"In (null when empty — do not fake 0 silently), fps and "
|
|
2761
2770
|
"start from the pool sequence (frames = round(seconds × "
|
|
2762
|
-
"fps));
|
|
2763
|
-
"
|
|
2771
|
+
"fps)); decode a keyed timemap to its speed (E140) and "
|
|
2772
|
+
"report a map the decoder cannot read as speed null "
|
|
2773
|
+
"rather than 100%. The "
|
|
2764
2774
|
"parser exposes these and editorial.parse_interchange "
|
|
2765
2775
|
"{format:'drt', content: PATH} walks one timeline into "
|
|
2766
2776
|
"normalized events so two timeline versions diff through "
|