Commit Graph
5192 Commits
Author SHA1 Message Date
vangel76 f6a867a951 Disk cache: an entry larger than the cache is skipped before it is sealed (#3750 review) 2026-11-18 13:17:19 +01:00
vangel76 c2c40200f6 Caching: the test of a still cached twice checks that its memory goes once nobody holds it (#3750 review) 2026-11-18 13:03:27 +01:00
vangel76 9bbc0847ad Caching: a still cached both whole and as a frame can be let go, and a plane entry without memory to seal it is skipped (#3750 review) 2026-11-18 12:57:37 +01:00
vangel76 3494ef8552 Caching: an oversized Cryptomatte plane stays beside held ones, disk copies are made a job at a time, and the review tests prove what they claim (#3750 review) 2026-11-17 17:40:16 +01:00
vangel76 5d0bfe7869 Caching: memory is let go only where it frees memory, Purge keeps nothing decoding meanwhile, and regions read the rows they show (#3750 review)
- Cryptomatte planes: a plane a render holds is not offered for its gone channels, and the entry
  limit holds while renders hold every plane.
- Footage frames and whole stills held elsewhere are not offered to the memory accountant.
- Purge (clear frames) makes decodes in flight stale: their frames are not kept or joined.
- Plane store: a size refusal of a merged decode is not handed to a request that fits alone;
  slimming a shared set and copies for the disk cache take memory fallibly, and planes the disk
  cache can't take are not copied.
- Disk cache: the plane encoder's scratch is taken fallibly; no memory skips the entry.
- Region of interest: rows follow the projected transform of a 2D layer under a 3D parent, and
  a frame of another size than its footage is read whole.
- The box filter's work bound is checked without a wall clock.
2026-11-17 17:00:29 +01:00
vangel76 1613e8d24a OpenEXR: read through craft-exr's seekable reader as merged in craft-libs (#3301) 2026-11-17 11:10:35 +01:00
vangel76 fc4eddf2d5 Merge upstream/main into the plane store branch (#3301)
# Conflicts:
#	Cargo.toml
2026-11-17 11:10:07 +01:00
vangel76 c205773d92 Caching: memory is counted where it is held, and whole layers stay whole under a viewer region (#3301 review)
- The memory accountant is offered only layer buffers and preview frames nobody
  else holds, so what it counts as freed is freed; the frame cache's recycled
  buffers count and go first.
- A Cryptomatte plane over the matte cache's own limit is kept only where the
  common budget trims it.
- Disk cache entries read back take their buffers fallibly: memory the system
  can't give is a miss.
- The Layer panel, sampleImage and effect inputs read whole footage frames under
  a viewer region of interest.
- A 16K Cryptomatte source at half resolution is box-filtered, not looked up
  nearest-neighbour.
- The System Compatibility Report shows the cache budget in force.
- A Project panel thumbnail render never starts under a key held back from an
  earlier state.
- Convert Expression to Keyframes makes no keys on a property that can't be
  animated.
2026-11-17 11:09:13 +01:00
Dylan M. Taylor aeedb92ef2 Merge pull request #3801 from storytold/refactor/shared-svg-transform
svg: reuse shared permissive transform-list parsing
2026-11-17 03:16:41 -05:00
Dylan M. Taylor ce2df07d52 svg: integrate merged transform parser with current main 2026-11-17 02:16:35 -05:00
Dylan M. Taylor bb54263240 Merge remote-tracking branch 'origin/main' into refactor/shared-svg-transform 2026-11-17 02:16:32 -05:00
Dylan M. Taylor 7a34ceffe2 Merge pull request #3798 from storytold/refactor/shared-svg-colors
svg: use shared floating-point colour compatibility parser
2026-11-17 00:39:00 -05:00
Dylan M. Taylor ed7b40ab4d Merge shared CSS integration while retaining transform compatibility 2026-11-17 00:05:47 -05:00
Dylan M. Taylor 69b4115b36 Merge remote-tracking branch 'origin/main' into refactor/shared-svg-colors 2026-11-17 00:04:44 -05:00
Dylan M. Taylor c7068ae948 Merge pull request #3797 from storytold/refactor/shared-svg-stylesheet
svg: move stylesheet parsing and matching to craft-svg
2026-11-17 00:04:16 -05:00
Dylan M. Taylor 9953ca314d svg: consume shared compatibility transform-list parser 2026-11-16 23:22:52 -05:00
Dylan M. Taylor 76d98ecd4b svg: retain prefix-path API alongside color compatibility 2026-11-16 23:10:16 -05:00
Dylan M. Taylor f65ad2a42d Merge current main and retain CSS plus prefix-path shared APIs 2026-11-16 23:10:13 -05:00
Dylan M. Taylor d0cbc53494 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	Cargo.lock
#	Cargo.toml
2026-11-16 23:02:54 -05:00
Dylan M. Taylor 41da144555 Shape operators: cap each expanding operator's output (#2948) 2026-11-16 21:58:09 -05:00
Dylan M. Taylor defa16a26f svg: use shared bounded prefix path parsing (#3800) 2026-11-16 21:58:04 -05:00
Dylan M. Taylor 99a9af86b1 svg: pin color compatibility to merged shared library 2026-11-16 21:50:00 -05:00
Dylan M. Taylor d5755f5dd9 Merge remote-tracking branch 'origin/main' into refactor/shared-svg-colors 2026-11-16 21:49:57 -05:00
Dylan M. Taylor b29778b577 svg: pin stylesheet consumer to merged shared implementation 2026-11-16 21:10:12 -05:00
Dylan M. Taylor ca5ca106fa Merge remote-tracking branch 'origin/main' into refactor/shared-svg-stylesheet 2026-11-16 21:09:59 -05:00
Dylan M. Taylor 6d908d1301 Merge pull request #3215 from vangel76/cc-ball-action-params-3197
Ball Grid effect has all of After Effects' CC Ball Action controls, including flat balls without shading
2026-11-16 20:39:25 -05:00
Dylan M. Taylor 22dbd1612f Merge pull request #3246 from vangel76/waveform-reversed-3238
The Timeline waveform shows what is really heard for reversed layers and the Backwards effect
2026-11-16 20:37:23 -05:00
Dylan M. Taylor bf29ef51b0 Merge pull request #3794 from vangel76/fix/ocio-test-windows-path-3793
OCIO LUT test passes on Windows
2026-11-16 20:31:41 -05:00
Dylan M. Taylor a9d53efbb5 svg: route paint colours through shared floating-point compatibility parser 2026-11-16 19:51:35 -05:00
Dylan M. Taylor 3972e5181b svg: delegate stylesheet parsing and matching to craft-svg 2026-11-16 19:38:19 -05:00
vangel76 ea4ac2e5ed Refuse OpenEXR blocks larger than their chunk can hold
craft-exr now holds every block to what its chunk's bytes can
decompress to, using the ratio the index was built with: the index is
built with craft-exr's default ratio (no longer unbounded), a file with
such a block is refused when indexed and by safe_to_decode before the
image crate sees it, and each read checks it again. Memory the system
refuses during a read is a read that failed just now, not remembered,
instead of a file too large.
2026-11-16 23:07:23 +01:00
vangel76 c1aea6d65a Bound OpenEXR pictures in memory and keep effects' depth fill
The picture of an OpenEXR file (also the black one of a file without a
main picture) is checked before anything is read: no larger than a
still may decode to and than one read of the file may allocate, else
refused with the reason instead of allocated. Import refuses such a
picture as other stills. The fill of a picture channel in a part named
like depth is the background depth again, as effects read it; the
picture is 0 outside that part's data window when composed instead.
A read decompresses on at most four threads of its own, none for a
small file.
2026-11-16 22:59:38 +01:00
vangel76 d671f6e45b Show an OpenEXR file's main picture as After Effects does
The picture of an OpenEXR file is now craft-exr's main picture: the
unprefixed R, G, B (and A) of the first part that has all three, else
the first part's unprefixed Y (and A) as grey. A file of named layers
only (Blender's ViewLayer.Combined.R, a compositor's Image.R) has none
and shows black at its display window's size, opaque, as After Effects
shows it; it still imports and its layers stay readable by effects
(EXtractoR, Cryptomatte, the 3D Channel effects).

The own picture choice (the beauty pass by name, data passes, the first
channel as grey) is gone. The picture's channels keep a fill of 0
outside the data window even in a part named like depth, so the picture
of such a file stays what the image crate shows. The golden hashes of
the named-layer files are re-pinned (their channels are unchanged), and
the docs describe the new rule.
2026-11-16 22:30:46 +01:00
vangel76 fa542829e9 #3793: build the OCIO test's expected LUT path from its parts
join("luts/grade.cube") keeps the forward slash on Windows, while the code
resolves the config's LUT as luts\grade.cube, so the test's text lookup in the
read log missed there. The code under test is unchanged.
2026-11-16 22:05:56 +01:00
vangel76 ccd4c75f4f Keep refusing damaged OpenEXR headers before a decoder sees them
safe_to_decode accepts a file only when its headers index (or name a
compression or part kind this reader doesn't cover); damaged headers,
offset tables longer than the file, oversized parts and failed reads
are refused again, as the old lenient parse did. Indexing also refuses
a channel list the exr crate's validation refused (a zero sampling
factor or one not dividing the data window, channels out of order),
since headers are now read leniently only. Follows craft-exr's new
UnsupportedCompression error kind for HTJ2K and its non-exhaustive
error enum. The damaged-file test now checks that the good files index
and read and that damaged ones reach the reader.
2026-11-16 22:02:29 +01:00
vangel76 58038903bd Read OpenEXR planes through craft-exr's seekable reader
The plane store's index and reader now use craft_exr::seek: Index::build
reads and checks the headers and offset tables, read_planes fetches only
the chunks of the requested channels, rows and level. The app keeps what
is its own: the file identity, plane names and aliases, Cryptomatte
manifests, the picture's channels, the memory cap of one read and its
message, cancellation and the error mapping. The own chunk reading,
batching and header parsing are gone, and the exr crate is only a
dev-dependency of effectcraft-media now (the tests write files with it).
2026-11-16 21:45:05 +01:00
vangel76 9ff031c5f1 Merge upstream/main into the plane store branch (#3301)
Conflicts: Cargo manifests (craft-libs pins from main, plus memory-stats, exr and
half for effectcraft-media), exr_channels.rs (the plane store's version; main's
craft-exr channel decode is replaced by the plane store until craft-exr reads
from a seekable source), pool.rs (frame_px takes the rows of #3271 and the
forget generation of #2042), session open/forget (main's forget_files plus the
reload counter), Project panel thumbnails (main's Thumb types, keyed by content).
2026-11-16 20:57:45 +01:00
Dylan M. Taylor 60e2cbbbe3 Merge pull request #3783 from storytold/refactor/interchange-shared-preflight
interchange: use shared XML and JSON nesting preflight
2026-11-16 14:10:51 -05:00
Dylan M. Taylor e57aa567b9 interchange: pin merged shared nesting preflight 2026-11-16 13:33:08 -05:00
Dylan M. Taylor e2cbc0861f Merge branch 'main' into refactor/interchange-shared-preflight 2026-11-16 13:15:45 -05:00
Dylan M. Taylor a163fa3fcb Merge pull request #3773 from storytold/refactor/interchange-current-shared-film
interchange: stage current shared Film format dependency cutover
2026-11-16 13:14:50 -05:00
Dylan M. Taylor de0843b193 interchange: pin merged optional marker-color parity fix 2026-11-16 12:32:32 -05:00
Dylan M. Taylor 3c20178e06 Merge pull request #3778 from storytold/cutover/psd-unpredict-scratch
psd: delegate ZIP prediction reversal with budgeted scratch
2026-11-16 12:28:29 -05:00
Dylan M. Taylor ee6f04c4fc refactor: pin merged PSD prediction scratch API 2026-11-16 11:40:58 -05:00
Dylan M. Taylor b6d2598b3f interchange: delegate lexical depth preflight to craft-timeline 2026-11-16 11:27:30 -05:00
Dylan M. Taylor e9d5f37561 test: use valid encoded PCE layout for AAC downmix parity 2026-11-16 11:09:24 -05:00
Dylan M. Taylor b842402a83 interchange: retain EDL guessed-path bounds with current Film metadata 2026-11-16 11:04:56 -05:00
Dylan M. Taylor 9da73e9cf3 psd: delegate ZIP prediction reversal with budgeted scratch 2026-11-16 09:47:19 -05:00
Dylan M. Taylor adb120c327 interchange: update test fixtures and adopt merged shared AAF route 2026-11-16 09:41:59 -05:00
FredApps 91f9e9b1ef Merge pull request #3776 from FredApps/onee/i786-psd-cutover-followup
psd: parse linked files with craft-psd and pin past #1845
2026-11-16 15:20:44 +01:00