Commit Graph
304 Commits
Author SHA1 Message Date
Dylan M. Taylor 9fa8a069da Merge current main and pin merged shared Sony LUT readers 2026-11-16 06:51:41 -05:00
FredApps 3570d59d43 media, export: read MPEG TS AAC config and check encoders with craft-libs, drop four filmcraft pins
crates/media reads the MPEG TS/PS stream FilmCraft's source plays with
craft_media::mpegts and LATM configuration with craft_audio::aac::latm_config.
The VP9, HEVC and AV1 encoder round-trip tests decode with craft-video's
decoders. filmcraft-mpegts, filmcraft-vp9, filmcraft-hevc and filmcraft-av1
are no longer direct dependencies (storytold/craft-libs#781).
2026-11-16 11:18:56 +01:00
FredApps ce23259bf5 Merge main into i778/effectcraft-opus-craft-audio
Take #3763's shared GIF/WebP frame decode (craft-gif/craft-webp frames
features). Keep workspace craft-libs pins at 5a7a63a2 except the #3653
PDF/PS pins at 808730f4.
2026-11-16 10:32:46 +01:00
FredApps 8801c6bc0a Merge main into i778/effectcraft-opus-craft-audio
Take #3653's shared EPS/PostScript cutover: add craft-ps and pin
craft-pdf, craft-ps and the Hayro parser crates to 808730f4. Keep the
remaining workspace craft-libs pins at 5a7a63a2 (#1593).
2026-11-16 09:51:46 +01:00
FredApps bf8a9b9256 Merge remote-tracking branch 'upstream/main' into codex/effectcraft-gif-webp-decode-shared
# Conflicts:
#	Cargo.lock
2026-11-16 09:50:24 +01:00
FredApps 1b832a6110 Merge main into i778/effectcraft-opus-craft-audio
Take #3671's shared GIF writer (craft-gif) in export. Keep workspace
craft-libs pins at 5a7a63a2, which already includes that writer revision.
2026-11-16 09:49:38 +01:00
FredApps 58f64cdc09 Merge pull request #3653 from storytold/codex/effectcraft-eps-shared-cutover
Use shared EPS font block scanner
2026-11-16 09:47:31 +01:00
FredApps f6fdd27f36 Merge pull request #3671 from storytold/codex/gif-writer-consumer
export: write animated GIFs with the shared craft-gif writer (#778)
2026-11-16 09:36:06 +01:00
FredApps a32f16f25d Merge main into i778/effectcraft-opus-craft-audio
Keep workspace craft-libs pins at 5a7a63a2 (#1593), which already includes
main's older exr and lottie revisions. Retain the craft-cms pin at 9fd926dc
from #3744; SPI1D landed on craft-libs main after #1593.
2026-11-16 09:05:56 +01:00
FredApps 790b065d53 Merge remote-tracking branch 'upstream/main' into codex/effectcraft-eps-shared-cutover
# Conflicts:
#	Cargo.toml
2026-11-16 08:28:12 +01:00
FredApps dd850f92a9 Merge remote-tracking branch 'upstream/main' into codex/effectcraft-gif-webp-decode-shared
# Conflicts:
#	Cargo.toml
#	crates/media/Cargo.toml
2026-11-16 08:25:10 +01:00
FredApps 737322678c Merge pull request #3744 from storytold/extract/shared-spi1d
effects: cut SPI1D parsing over to craft-cms
2026-11-16 08:24:45 +01:00
FredApps 11ac2ad295 Merge remote-tracking branch 'upstream/main' into codex/gif-writer-consumer
# Conflicts:
#	Cargo.toml
2026-11-16 08:21:08 +01:00
FredApps b68b840245 Merge pull request #3646 from storytold/codex/effectcraft-exr-shared-consumer
refactor(exr): decode channels with shared craft-exr
2026-11-16 08:20:17 +01:00
Dylan M. Taylor 186661829a media: decode animated GIF and WebP through craft-gif and craft-webp frames
Carved out of #3649. craft_gif::frames and craft_webp::frames replace the
image crate's animation decoders in gif_anim and webp_anim, with the same
frame, byte and canvas limits and the same damaged-tail behaviour (frames
decoded before the damage are kept). craft-gif and craft-webp are pinned to
craft-libs main 948b5c23 with the frames feature.
2026-11-16 08:18:00 +01:00
FredApps 5bc065af79 Merge main into i778/effectcraft-opus-craft-audio; repin craft-libs to 5a7a63a2 2026-11-16 08:11:50 +01:00
FredApps 2e8938ca61 Merge remote-tracking branch 'upstream/main' into codex/gif-writer-consumer 2026-11-16 07:59:37 +01:00
FredApps e9e826bd25 Merge upstream/main into codex/effectcraft-eps-shared-cutover
Pin craft-pdf, craft-ps and the hayro parsers to one craft-libs main revision
(808730f4) so the pdf-deps validator accepts them, and drop the craft-eps
workspace pin that nothing uses after the craft-ps cutover.
2026-11-16 07:56:43 +01:00
FredApps bb0058444b Merge remote-tracking branch 'upstream/main' into extract/shared-spi1d
# Conflicts:
#	Cargo.lock
2026-11-16 07:48:25 +01:00
FredApps 286f2d0661 Merge remote-tracking branch 'upstream/main' into codex/effectcraft-exr-shared-consumer 2026-11-16 07:35:45 +01:00
Dylan M. Taylor 7a179a0efd Merge remote-tracking branch 'origin/main' into fix/effect3643-coverage 2026-11-15 20:02:51 -05:00
Dylan M. Taylor de68d5c300 Pin shared reencoded glyph fallback and test accented EPS 2026-11-15 14:59:50 -05:00
Dylan M. Taylor 70c140f027 Merge main and preserve isolated shared EPS parser suite 2026-11-15 14:27:32 -05:00
Dylan M. Taylor e1fc3ba0dc Merge main while isolating shared GIF writer revision 2026-11-15 14:13:01 -05:00
Dylan M. Taylor d2d3f47d92 Merge main and isolate shared EXR decoder revision 2026-11-15 14:08:54 -05:00
Dylan M. Taylor 414cddf4fe effects: use shared SPI3D and SPIMTX readers 2026-11-15 14:03:12 -05:00
Dylan M. Taylor d7d6007970 effects: use shared SPI1D table reader 2026-11-15 13:49:50 -05:00
Dylan M. Taylor ac1c1d9202 encoding: reuse shared Base64 writers across four consumers 2026-11-15 13:19:05 -05:00
Dylan M. Taylor 8fdbbc604c Refresh shared dotLottie cutover and propagate archive errors 2026-11-15 10:24:25 -05:00
FredApps e6a8cf8cec Export: WebM Opus from craft-audio; remove crates/opusenc
WebM export (VP9 and AV1) now encodes Opus with craft_audio::opus::Encoder
(the opus-encode feature). The shared encoder was imported from this crate,
and craft-libs #1593 ports the speed-ups that landed here afterwards, so the
packets are byte-identical to effectcraft-opusenc. Encoder errors are export
errors instead of panics.

All direct craft-libs dependencies, the lockfile and the PDF dependency
validator move to b850981f, the head of craft-libs #1593. Repin to its merge
commit once it lands.

Refs storytold/craft-libs#778
2026-11-15 16:05:11 +01:00
.CooCoo 7cbefaf70f Import: VectorCraft documents import through the PDF they carry (#2901)
* Import: VectorCraft documents import through the PDF they carry

File > Import reads a .vectorcraft file through the PDF that VectorCraft
saves in it with Create PDF-Compatible File, one page per artboard, as
footage or as a composition with one layer per PDF layer. The PDF is read
with craft-doc from craft-libs (plain or compressed files, the PDF inline
or after the JSON). A PDF after the JSON may be as large as a PDF file
EffectCraft imports (512 MiB). A document saved without that option gives
an import error that names it.

craft-doc, craft-vectorcraft-format (tests only) and craft-ecproj-format
are pinned to craft-libs fa1a6574; craft-ecproj-format is unchanged
between ca1b5e2e and that commit.

* Import: show file errors returned by the import dialog

* Keep dropped-file import errors alongside local drop errors

* Import: preserve every file error across background jobs and UI notices

* Import: queue pending errors with bounded notification details

* Import: a damaged VectorCraft preview no longer stops the carried PDF

The importer read every rendition with craft_doc::renditions and then
picked the PDF, so a preview whose base64 was invalid or whose data lay
past the end of the file made the whole import fail. It now reads only
the PDF with craft_doc::rendition, from storytold/craft-libs#546, and
never decodes the preview. A document without a PDF still reports
NoCarriedPdf.

* Import: dismissing a picked import's error status acknowledges its details

A picked or menu import queued its error details with the status
report_import_errors set ("first (and 1 more)"), and show_result_errors
then replaced that status with "first; second". The two never matched,
so clicking the status left the details queued and they showed again.
Import commands now move the queued details to the status that replaces
it, also when After Effects project errors lead it. Other commands'
statuses never take over an import's details.
2026-11-15 03:45:56 -05:00
Dylan M. Taylor c3c23a9a6f refactor(pdf): use shared PostScript reader for EPS 2026-11-14 15:21:46 +00:00
Dylan M. Taylor 501c5a70c4 wip: wire shared craft-gif animation writer in effectcraft-export 2026-11-14 03:37:33 +00:00
Dylan M. Taylor 47eb768ba6 wip: repin craft-eps dependencies 2026-11-14 03:37:32 +00:00
vangel76 fcef7db85a Merge remote-tracking branch 'upstream/main' into tests-pin-english-3244
# Conflicts:
#	Cargo.lock
2026-11-14 00:11:28 +01:00
Dylan M. Taylor cb2cd0c5cf Use shared EPS embedded font scanner 2026-11-13 19:52:19 +00:00
FredAppsandFredApps 05fc7f2835 Tests: give the nested knockout draw-budget test two minutes, not twenty seconds, on a loaded runner (#3650)
Co-authored-by: FredApps <FredApps@users.noreply.github.com>
2026-11-13 20:27:01 +01:00
Dylan M. Taylor 9bb7b55e0d refactor(exr): decode channels with shared craft exr 2026-11-13 17:11:03 +00:00
Dylan M. Taylor e48c1c7c98 chore: pin shared libraries to merged dotlottie 2026-11-13 15:51:49 +00:00
Dylan M. Taylor 0627dd0e4b Use shared ZIP codec for dotLottie imports 2026-11-13 15:07:00 +00:00
Dylan M. Taylor dc9bf62870 Pin EffectCraft to merged craft-libs mesh 2026-11-13 07:18:50 +00:00
Dylan M. Taylor 8dca7d4e8a Merge remote-tracking branch 'origin/main' into codex/778-effect-migration
# Conflicts:
#	crates/aep/src/container.rs
#	crates/aep/src/container/aepx.rs
#	crates/aep/src/container/arbitrary.rs
#	crates/aep/src/container/camera.rs
#	crates/aep/src/container/effects.rs
#	crates/aep/src/container/footage.rs
#	crates/aep/src/container/header.rs
#	crates/aep/src/container/keys.rs
#	crates/aep/src/container/masks.rs
#	crates/aep/src/container/read.rs
#	crates/aep/src/container/settings.rs
#	crates/aep/src/container/shapes.rs
#	crates/aep/src/container/textdoc.rs
#	crates/aep/src/container/typed.rs
#	crates/aep/src/container/values.rs
#	crates/aep/src/container/version.rs
#	crates/aep/src/container/write.rs
#	crates/aep/src/import/markers.rs
#	crates/aep/tests/it/container.rs
#	crates/aep/tests/it/container/batch3_core.rs
#	crates/aep/tests/it/container/batch3_objects.rs
#	crates/aep/tests/it/container/cases_600.rs
#	crates/aep/tests/it/container/header.rs
#	crates/aep/tests/it/container/helpers.rs
#	crates/aep/tests/it/container/keyframes.rs
#	crates/aep/tests/it/container/layer_switches.rs
#	crates/aep/tests/it/container/matte.rs
#	crates/aep/tests/it/container/robustness.rs
#	crates/aep/tests/it/container/text_markers_footage.rs
#	crates/aep/tests/it/container/typed.rs
#	crates/aep/tests/it/container/values.rs
2026-11-13 02:53:56 +00:00
Dylan M. Taylor 92274ec914 Merge remote-tracking branch 'origin/main' into codex/778-effect-migration
# Conflicts:
#	crates/aep/src/container.rs
#	crates/aep/src/container/footage.rs
#	crates/aep/tests/it/container/robustness.rs
#	crates/model/src/fbx.rs
#	crates/model/src/gltf.rs
#	crates/model/src/obj.rs
2026-11-13 02:26:44 +00:00
Valentin KleinandFredApps a4bde72bca .aep: import twice as fast, faster export (#3302)
* aep: a layer's markers and Source Text are read where they are stored, not searched for (#3276)

A layer's marker list is a direct child of its root tdgp, and its Source Text record
btds a direct child of the ADBE Text Properties group. Markers walked the whole layer
subtree twice per layer (most layers have no marker list, so the walk always ran to the
end), and the three text-document accessors walked it once each.

* aep export: build the prototype template once, sort names with cached keys (#3277)

The template every export clones from is immutable; it is now built by the
first export of the process and kept (about 0.93 MB). The name sort builds
each natural key once instead of on every comparison. Root solids move into
the Solids folder instead of being copied. The two key-list rewrites share one
emit-local helper and match names compare as bytes instead of a decoded String.
Output is byte-identical.

* aep container: size sibling lists, hex and write output once; borrow plain .aepx attributes (#3275)

- read.rs: count the chunk headers of a sequence first and allocate the
  children Vec once (bounded by the input and by the chunk limit).
- aepx.rs: decode_hex sizes its output once; attribute values without
  an entity are borrowed instead of copied through decode_entities.
- typed.rs: PropGroup::get compares match names without building a
  String (same result as the lossy compare, invalid UTF-8 included).
- write.rs: reserve the exact output size up front (try_reserve, so a
  hand-built tree cannot abort on the allocation).
- read.rs, settings.rs, values.rs: use the shared bytes.rs readers.

Output is identical on the corpus (tree, written bytes, import).

* aep container: review fixes (#3275)

- read.rs: reserve with try_reserve_exact, so a raised chunk limit on a
  small target cannot abort before parsing; the capped reservation and a
  deep, retry-heavy nest of broken lists are pinned by tests.
- write.rs: a tree past the 32-bit container size fails with TooLarge
  before anything is serialised.
- aepx.rs: drop an unneeded local and lifetime annotation.

* aep export: note what the concurrency test covers and why a failed template build is not kept (#3277)

* aep: text documents are read without a String per token, defaults built once (#3276)

TextDocument::parse reads a borrowed tree: names, bare words and strings without
escapes point into the body, keys are borrowed when they are /names, numbers parse from
the borrowed bytes, and dictionaries and arrays are moved into vectors of their exact size
when they close. The style and paragraph defaults are built once instead of per document.
parse_text_dict keeps its public TextValue result (the borrowed tree turned owned).

The old owning parser stays as a test-only oracle: a differential test compares both on
40 000 generated bodies (every key form the owned keys canonicalise, non-UTF-8 names,
escapes, unclosed strings, non-finite numbers), every cut of a realistic document and
nesting around the depth limit.

* aep: text-dict test builds its prefix without repeat(1) (#3276)

* aep: an escaped text string drops its byte order mark without a range drain (#3276)

* aep export: one key-time loop, key-list rewrite, tdmn decoder and byte writer for the listed modules (#3278)

In masks, shapes, styles, synth, fxsynth, base, camlight, skeleton,
textanim and tree (effects.rs, plan.rs and emit.rs keep their copies for
the follow-up work):
- New export/keys.rs: the key-time loop (timed_keys), the key-list rewrite
  (fill_key_list, set_key_list, replace_cdat) and the spatial key record,
  shared by masks, shapes and styles.
- One tdmn decoder (synth::tdmn_name, lossy UTF-8 up to the first NUL, as the
  importer reads it) and one encoder (synth::tdmn) instead of the copies in
  masks, styles, shapes, textanim, camlight and skeleton.
- One byte writer: tree::put, which errors. base::bytes, synth::tdb4,
  synth::key_list, fxsynth::pard, masks::shph and the keyed path records write
  through it; their fixed layouts keep the infallible signatures behind
  tree::fixed, which logs, and a test builds every layout and requires no error.
- camlight::put_group uses the shared group split (tree::split_group), which
  errors on a match name without a node instead of stopping quietly.

Export output is byte-identical on the corpus and the synthetic fixtures.

* aep export: pin the key-time loop's report, name the layout in the base::bytes log (#3278)

* aep export: review fixes for #3278

- tree::Fixed replaces tree::fixed: a fixed layout writes every field that
  fits (as the old code did) and keeps the first error; finish() logs it
  once with the layout's description and counts it per thread, so the
  every-layout test cannot race with other tests.
- base::bytes logs one line naming its length and fields.
- masks::build_atom errors when the prototype has no Mask Shape instead of
  dropping the path of every mask quietly.
- log sorted into the dependency list.

* aep: review fixes for #3276 text documents and markers

text_document reads the first btdk in the Source Text record, the documents
text_document_count counts. The old slot checks (same, is_neutral, undecoded_fields)
join the test oracle and are compared on 20 000 generated slot dictionaries; mixed
dictionary/array chains and a document left open at the depth limit join the parser
differential. An escaped string's byte order mark is drained without a copy.

* aep: remove test-only container accessors, share report and time-base code (#3281)

- Remove 35 public container accessors that only tests called (header,
  camera/light, keys, footage, masks, shapes, version) and the dead
  StyleMap::switch_name. Tests now check the importer's own reading of the
  same bytes, or the decoder it uses; three import tests gain the values
  the removed checks covered.
- Import and export reports share one loss entry (Loss<C>) with record,
  total, count and summary; the JSON shape is pinned for both.
- Collector::lose_with builds a detail only below the detail cap (callers
  switch later).
- The export uses the container's TimeBase; one NTSC table serves import
  and export; TimeBase::frames saturates like units instead of returning 0.

* aep: review fixes for #3281: NTSC table beside TimeBase, real-path NTSC round trip, light and camera defaults on import, doc wording

* aep: drop a local check tool committed by mistake (#3281)

* aep export: sort keys as one compact byte string, bounded by the name (#3277)

The cached natural keys were Vecs of (bool, String, u128) segments: a 255-byte
name of alternating letters and digits took about 14 KB, held for every item at
once. Each key is now one byte string whose byte order is the natural order,
at most 5 bytes per name byte. Order and output are unchanged.

* aep container: check bdata digits and size before reserving (#3275)

decode_hex reserved the decoded size before it knew the value decodes,
so a large bdata with a bad digit reserved half its length first. It now
refuses a value larger than a chunk's 32-bit size field (TooLarge), checks
every digit in one vectorisable pass, and only then reserves, with
try_reserve_exact so a value that does not fit in memory is an error
instead of an abort.

* aep export: the every-layout test counts from a baseline, not from zero (#3278)

* aep export: correct the order the natural sort key doc gives for equal numbers (#3277)

* aep: the format notes name the accessors that remain (#3281)

* aep: the format notes name the 1 x 1 mask scale of text and shape layers (#3281)

* aep: read imports through a flat tree index (#3300)

Import reads an .aep through TreeIndex, one depth-first array of chunks that
borrows the file's bytes, instead of building and freeing the owned Chunk tree
(one Vec per list). The parser mirrors read::Parser step for step: the same
chunk count order against max_chunks, the same depth limit and opaque
fallbacks, the same errors. The typed view reads through Node, a handle to a
chunk of either tree, so the accessors work unchanged on both; .aepx keeps its
owned tree. Chunk, parse and write stay for export and editing.

The array starts small and doubles, never past what the input can hold or the
chunk limit allows; a failed allocation is TooLarge, a tree past u32 indices
TooManyChunks.

* aep export: the time remap and Transform keys use the shared key-list and match-name helpers; doc comments for the audit's functions (#3300)

* #3300: import .aepx through the flat index

The .aepx reader no longer builds the owned chunk tree element by
element. It decodes every body (hex, text, alias JSON, numbers) into
one buffer and records the chunks as depth-first entries whose bodies
are ranges of that buffer; TreeIndex::from_drafts turns them into the
index the importer reads, which borrows the buffer. read_aepx converts
that index into the owned tree in one pass.

The tree and the errors are those of the previous reader, which the
tests keep as the reference: generated and damaged documents under
seven limit sets, invalid UTF-8, hostile input, the fixture directory,
and imports through both. Bound tests pin the chunk list to the input
and the limit, and check that dropped content leaves nothing behind.

* #3300: read_aepx keeps its own owned-tree reader

read_aepx, read_aepx_with_limits and parse_any build the owned chunk
tree element by element again, as before the .aepx index, instead of
converting the index (which held the decoded buffer and the owned tree
at the same time). Import keeps the index reader. The tests now
compare the two production readers.

* #3300: test keys that round to the same time

* aep: compare the destination projects in the index-equivalence tests

both() and both_aepx() kept only the ImportResult of each path; they now keep
both destination Projects and assert structural and serialized equality, so a
layer or property value regression cannot pass on equal ids and reports.

---------

Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
2026-11-13 00:54:29 +01:00
Dylan M. Taylor 1ae04027df fix app adapters for shared format readers 2026-11-12 06:23:01 +00:00
Dylan M. Taylor 3e1965e274 Dependencies: pin craft-libs at current main 2026-11-12 05:34:09 +00:00
Dylan M. Taylor fd1df348c0 Formats: move EffectCraft format codecs to craft-libs 2026-11-12 05:33:48 +00:00
Dylan M. Taylor 79c42749a8 Export, Media: codecs and containers from craft-libs; remove hevcenc, av1enc, vp9enc (#3522)
* Export, Media: H.264, ProRes, HEVC, VP9, AV1, AAC, MP4 and Matroska come from craft-libs

crates/export and crates/media use craft-video, craft-audio and craft-media
(one craft-libs rev) instead of filmcraft-h264enc, -prores, -aac, -isobmff,
-matroska and -opus. The av1enc, hevcenc and vp9enc crates are removed:
craft-video carries the same encoders, with the later changes merged in
storytold/craft-libs#829. Their round-trip tests move to crates/export/tests
and run against craft-video.

opusenc stays (craft-libs has no Opus encoder yet), as do filmcraft-mpegts
and the filmcraft-vp9, -hevc and -av1 decoders the tests use as oracles.

* Pin craft-libs at the main commit that has the encoder colour description (e7c3dda7)
2026-11-11 18:46:50 -05:00
Dylan M. Taylor cbddc9d284 Fix Flatpak updates and bump to 0.24.1 (#3516)
* fix(flatpak): allow release checks and self-update helpers

* test: keep Flatpak permission parsing within strict Clippy rules

* chore: bump version to 0.24.1 for the Flatpak update fix
2026-11-11 15:25:13 -05:00
Dylan M. Taylor 6ff564e750 SVG: bound tessellation, kept geometry, attributes, entity expansion and re-rendering (#2986)
* SVG: bound tessellation, kept geometry, attributes, entity expansion and re-rendering

Circles and rounded rects flattened at a fixed 0.01 tolerance, so a huge
radius made unbounded curves; the tolerance now grows with the radius as
arcs already did. Every path a <use> copies and every gradient reference's
stops were parsed and kept without a document-wide limit; both now share a
budget of 8 million items. An element with thousands of attributes made
the XML parser's duplicate check quadratic, and repeated entity references
could expand attribute text to gigabytes below the node limit; a preflight
refuses more than 1,024 attributes per element and entity references that
expand past 64 MiB. Nested knockout and non-isolated groups re-rendered
their children several times per level; node draws are now held to 64 per
node of the tree.

* address review: entity_bytes takes the largest declaration of each name

* address review: drop tessellation-tolerance, attribute-count and entity-size refusals; keep retained and draw budgets, warn when the draw budget is hit
2026-11-11 14:39:06 -05:00