961 upstream commits since 7bb6c900. Resolutions:
- Test-only conflicts: upstream tests from before the base that our side
cut stay cut; tests new upstream are kept (audio aac/config, layout,
encode_format; cms lutfile; media mux; print windows_native, ticket;
update self_update; xml hostile).
- Code our side moved, with upstream's change carried to the new place:
craft-media mux roll sample groups (mux/boxes.rs) and writer-start
offsets with overflow checks (mux/progressive.rs); craft-print's
shrink-to-fit scale guard (sheets/plan.rs); craft-update's nextest
archive detection (self_update/detect.rs); craft-vectorcraft-format's
Tail::write_to_with (container.rs); craft-i18n's pedantic fixes
(bidi.rs, negotiation.rs).
- craft-ui: the old crate's modules stay removed; gpu_test_lock guarded
their per-test wgpu renderers, which the snapshot kit does not have.
- New upstream tests in crates that build their integration tests into
the library's test executable are modules of tests/main.rs (audio
flac_decode and qoa_oracle, cms, docpath, pcraft-format,
vectorcraft-format).
- The 22 new crates are optional members of the craft facade.
ale, build, edl, fx, path, rate and report are modules of the crate again, fcp7 and fcpxml behind the xml feature, otio behind otio, as storytold had them. The format list, the import and export options and the interchange error sit in interchange beside the neutral document and are re-exported at the crate root. The formats read and write time through rates, time and timecode: ALE rows through parse_time, an EDL timecode holds TimecodeFields, FCPXML format names use FrameRate's Display. Serde is always on, so the interchange types derive it unconditionally; the formats keep storytold's no-panic lints.
storytold's interchange tests run as trials of the lib's one test executable: the modules' own tests always, tests/it/{fcp7,fcpxml,otio} with the xml and otio features.
- HeaderColumns: one set of header columns per pass, worked out from the model before the view shows. The switch
columns are the ones some track has; the name column is the widest track name with its pads and indent, or the
width the user dragged; the headers are at least as wide as the timecode and toolbar block over them. Every pane's
TrackStack, the top strip's head column and the TimelineView's inset (header_extent) take the same extent.
- The top strip's head column is the header extent and its columns touch; the marker strip and the ruler sit in a
fill-width stack, so they span the time area from where the lanes start.
- BodyLayout::grid takes owned or borrowed columns.
- TimecodeField::large keeps the timecode face (equal-width digits), so its widest sample is its widest text.
- MeasureCx::field_text: an editable text's room with the caret past its last letter. TextField, NumberField,
TimecodeField, DateField, ComboBox and the font picker size by it.
- Trial: the ruler starts where the lanes do, and no header has a column no track has.
The tick body is the label line over a mark row one label line high, as the old ruler kept a tick row under its labels. The video bracket hangs from the row's top, the audio bracket stands on its bottom, and each tag stays inside the row, so neither covers a tick label.
Bar::align sets the body row's alignment; Bar::trailing gets the bar's body
context so an end-region group can read and write the state the body reads.
A centred or end-aligned row in a body that scrolls along x measures its band
from the view, as the shrink step does.
Each row is a read-only readout: the time in mono with tabular figures, centred, the first row in the accent ink, the
caption centred under it in muted caption type, with no hover, press or selection look. A readout is one Tab stop
and a click focuses it; a secondary click, the Menu key or Shift+F10 opens that row's menu through Menu::context.
The selecting List of ListRows and its selection memory go.
#987 (FCPXML) was squash-merged after #1002 (OpenTimelineIO), which was stacked on it. The squash
carried #987's older copies of Cargo.toml, lib.rs, model.rs, README.md and the tests, which removed
the otio feature and module wiring that #1002 had added. This puts back #1002's merged state of
crates/timeline exactly; it already contains every FCPXML change.
* craft-timeline: a neutral timeline model and the import builder
model: a Project of bins and items (media, sequences, subclips, and items no
interchange format carries), sequences of tracks with clips, transitions,
markers and effects with keyframes. Cut down from FilmCraft's project model to
what Final Cut Pro 7 XML, FCPXML and OpenTimelineIO describe; EffectCraft
already uses that shape for its interchange. Three things stay the
application's: effects (looked up through a Catalog the caller supplies),
generators beyond the common ones (Generator::Other with an opaque payload),
and per-object extension JSON (ext) that a format can carry unread.
fx: the effect and parameter ids the formats name themselves, and Standard,
a catalog of just those.
build: FilmCraft's import Builder and shared helpers (filmcraft-interchange
common.rs at 4bec22bd) on the model, with the effect registry replaced by the
catalog, and the bounds every import ends with (Imported::bound, from lib.rs).
* craft-timeline: Final Cut Pro 7 XML (xmeml) on the neutral model
fcp7: FilmCraft's xmeml reader and writer (filmcraft-interchange fcp7.rs at
4bec22bd) moved onto craft_timeline::model, behind feature xml.
- XML is read with craft-xml, strictly: at most 256 levels of nesting (the
limit EffectCraft checked with its own depth scan before handing documents
over), 2 000 000 nodes, 256 MiB; a document type declaration with an internal
subset and entities XML does not define are refused. It is written with
craft-xml's Writer.
- Effects other than motion, opacity, time remap, audio levels and pan are
looked up through the caller's Catalog, by id and by name, and written with
the catalog's stable name and category.
- An application generator round-trips as <namespace>:<payload> in effectid
(FilmCraft wrote filmcraft:<json>); transparent video, counting leader and
bars and tone are written by name, which the reader already took.
- Finding the sequence a clip item is in is one walk of the document instead of
an ancestors() lookup per clip item.
tests/it: FilmCraft's FCP7 integration tests (the hand-written Premiere-style
document, the rich round trip, the 48-case property round trip, split mono and
stereo channels, sub-frame spans, absurd timebases and start timecodes, the
link-group bound) on the model, with a test catalog for the four application
effects they use.
* craft-timeline: FCPXML on the neutral model
fcpxml: FilmCraft's FCPXML 1.9-1.11 reader and writer (filmcraft-interchange
fcpxml.rs at 4bec22bd) moved onto craft_timeline::model, behind feature xml.
XML is read with craft-xml as fcp7 is; filters other than the transform,
blend and volume adjustments go through the caller's Catalog by name, and an
effect resource's uid is <namespace>.<effect id> (FilmCraft wrote
filmcraft.<id>). ExportOptions gains fcpxml_version.
tests/it/fcpxml.rs: FilmCraft's FCPXML integration tests on the model (the
hand-written connected-clips document, hostile lane numbers, standalone video
stills, self-referencing compound media, round trips at 1.9, 1.10 and 1.11,
the property round trip with its regression seed, percent-decoded relative
URLs). The FCP7 tests export to FCPXML again where FilmCraft's did.
* craft-timeline: a neutral timeline model and the import builder
model: a Project of bins and items (media, sequences, subclips, and items no
interchange format carries), sequences of tracks with clips, transitions,
markers and effects with keyframes. Cut down from FilmCraft's project model to
what Final Cut Pro 7 XML, FCPXML and OpenTimelineIO describe; EffectCraft
already uses that shape for its interchange. Three things stay the
application's: effects (looked up through a Catalog the caller supplies),
generators beyond the common ones (Generator::Other with an opaque payload),
and per-object extension JSON (ext) that a format can carry unread.
fx: the effect and parameter ids the formats name themselves, and Standard,
a catalog of just those.
build: FilmCraft's import Builder and shared helpers (filmcraft-interchange
common.rs at 4bec22bd) on the model, with the effect registry replaced by the
catalog, and the bounds every import ends with (Imported::bound, from lib.rs).
* craft-timeline: Final Cut Pro 7 XML (xmeml) on the neutral model
fcp7: FilmCraft's xmeml reader and writer (filmcraft-interchange fcp7.rs at
4bec22bd) moved onto craft_timeline::model, behind feature xml.
- XML is read with craft-xml, strictly: at most 256 levels of nesting (the
limit EffectCraft checked with its own depth scan before handing documents
over), 2 000 000 nodes, 256 MiB; a document type declaration with an internal
subset and entities XML does not define are refused. It is written with
craft-xml's Writer.
- Effects other than motion, opacity, time remap, audio levels and pan are
looked up through the caller's Catalog, by id and by name, and written with
the catalog's stable name and category.
- An application generator round-trips as <namespace>:<payload> in effectid
(FilmCraft wrote filmcraft:<json>); transparent video, counting leader and
bars and tone are written by name, which the reader already took.
- Finding the sequence a clip item is in is one walk of the document instead of
an ancestors() lookup per clip item.
tests/it: FilmCraft's FCP7 integration tests (the hand-written Premiere-style
document, the rich round trip, the 48-case property round trip, split mono and
stereo channels, sub-frame spans, absurd timebases and start timecodes, the
link-group bound) on the model, with a test catalog for the four application
effects they use.
* craft-timeline: FCPXML on the neutral model
fcpxml: FilmCraft's FCPXML 1.9-1.11 reader and writer (filmcraft-interchange
fcpxml.rs at 4bec22bd) moved onto craft_timeline::model, behind feature xml.
XML is read with craft-xml as fcp7 is; filters other than the transform,
blend and volume adjustments go through the caller's Catalog by name, and an
effect resource's uid is <namespace>.<effect id> (FilmCraft wrote
filmcraft.<id>). ExportOptions gains fcpxml_version.
tests/it/fcpxml.rs: FilmCraft's FCPXML integration tests on the model (the
hand-written connected-clips document, hostile lane numbers, standalone video
stills, self-referencing compound media, round trips at 1.9, 1.10 and 1.11,
the property round trip with its regression seed, percent-decoded relative
URLs). The FCP7 tests export to FCPXML again where FilmCraft's did.
* craft-timeline: OpenTimelineIO on the neutral model
otio: FilmCraft's OTIO reader and writer (filmcraft-interchange otio.rs at
4bec22bd) moved onto craft_timeline::model, behind feature otio (serde_json).
FilmCraft wrote its own serde types into metadata.filmcraft. Here the model's
fields are written as JSON by hand under metadata.<namespace>, with the same
keys and value shapes FilmCraft's serde produced (labels, settings, media
info, generators, effects with externally tagged parameter values, alignment,
marker kinds, channel layouts), so files FilmCraft wrote read back. Every key
the reader does not know comes back in the object's ext, and ext's keys are
written next to the model's: an application's palette, track volume, masks and
the like round-trip without the crate knowing them. ParamValue::Opaque and
Generator::Other carry values only the application reads.
The model's Sequence loses its ext: a sequence's is its item's, so there is
one place for it. ImportOptions gains name (for an unnamed timeline), as
FilmCraft's had.
tests: FilmCraft's OTIO integration tests on the model (the golden document,
the lossless round trip now through ext, collections and bare tracks, items at
an audio sample rate, generator labels and identity, the property round trip,
marker URLs, percent-decoded relative URLs); its palette tests stay with
FilmCraft, whose palette merge they test, and are replaced by one ext round
trip. The OTIO unit tests (exact rational times, the nested-copies limit) and
a JSON nesting test.
* craft-timeline: a neutral timeline model and the import builder
model: a Project of bins and items (media, sequences, subclips, and items no
interchange format carries), sequences of tracks with clips, transitions,
markers and effects with keyframes. Cut down from FilmCraft's project model to
what Final Cut Pro 7 XML, FCPXML and OpenTimelineIO describe; EffectCraft
already uses that shape for its interchange. Three things stay the
application's: effects (looked up through a Catalog the caller supplies),
generators beyond the common ones (Generator::Other with an opaque payload),
and per-object extension JSON (ext) that a format can carry unread.
fx: the effect and parameter ids the formats name themselves, and Standard,
a catalog of just those.
build: FilmCraft's import Builder and shared helpers (filmcraft-interchange
common.rs at 4bec22bd) on the model, with the effect registry replaced by the
catalog, and the bounds every import ends with (Imported::bound, from lib.rs).
* craft-timeline: Final Cut Pro 7 XML (xmeml) on the neutral model
fcp7: FilmCraft's xmeml reader and writer (filmcraft-interchange fcp7.rs at
4bec22bd) moved onto craft_timeline::model, behind feature xml.
- XML is read with craft-xml, strictly: at most 256 levels of nesting (the
limit EffectCraft checked with its own depth scan before handing documents
over), 2 000 000 nodes, 256 MiB; a document type declaration with an internal
subset and entities XML does not define are refused. It is written with
craft-xml's Writer.
- Effects other than motion, opacity, time remap, audio levels and pan are
looked up through the caller's Catalog, by id and by name, and written with
the catalog's stable name and category.
- An application generator round-trips as <namespace>:<payload> in effectid
(FilmCraft wrote filmcraft:<json>); transparent video, counting leader and
bars and tone are written by name, which the reader already took.
- Finding the sequence a clip item is in is one walk of the document instead of
an ancestors() lookup per clip item.
tests/it: FilmCraft's FCP7 integration tests (the hand-written Premiere-style
document, the rich round trip, the 48-case property round trip, split mono and
stereo channels, sub-frame spans, absurd timebases and start timecodes, the
link-group bound) on the model, with a test catalog for the four application
effects they use.