Mike-Solar
4babbf5de8
oak-common is gone; its modules (configstore, xmlutils, ocioutils,
oiioutils, colormath, colortransform, videoparams, ffmpegutils, ...)
now live in oak-core alongside the value types. The render value/GPU
types moved too: backend (wgpu context + DisplayRenderer), color
(ColorProcessor over ocio-rs), texture, frame, and the commonutil
config helpers.
Fix-ups to make the merged tree build and pass tests:
- oak-core Cargo.toml: wgpu back to 25 (the moved backend code is
written against that API generation); add the toml/quick-xml/image
deps oak-common carried.
- lib.rs: drop the duplicate 'pub mod error;'.
- error.rs: unified OAKCORE_* codes; restore Error::new() and
From<OcioError> from oak-common's error type.
- backend.rs/color.rs: oak_core::/oak_render:: self-references
rewritten to crate::; the shaderfx-dependent GPU effect test moved
to oak-render's shaderfx tests (shaderfx depends on oak-node and
cannot live in oak-core).
- oak-render's error module re-exports oak_core::error::{Error,
Result}; the OAKRENDER_* codes stay as the public-code contract.
- oak-node jobs.rs: ColorProcessor imported from oak_core::color.
- Integration tests repointed at oak_core::{texture, frame, backend,
color, colormath}.
- the display-ICC regression test treats an empty OAK_DISPLAY_ICC as
unset, matching displayicc::env_override_icc.
61 lines
2.4 KiB
TOML
61 lines
2.4 KiB
TOML
# Oak - Non-Linear Video Editor
|
|
# Copyright (C) 2026 Oak Team
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
[package]
|
|
name = "oak-worker"
|
|
version.workspace = true
|
|
edition = "2021"
|
|
description = "Oak Video Editor headless render worker process (Rust)"
|
|
license = "GPL-3.0-or-later"
|
|
|
|
[[bin]]
|
|
name = "oak-worker"
|
|
path = "src/main.rs"
|
|
|
|
[dependencies]
|
|
serde = { version = "1", features = ["derive"] }
|
|
serde_json = "1"
|
|
|
|
# POSIX shm_open/ftruncate/mmap/munmap/shm_unlink for the shared-memory
|
|
# frame-slot transport (the oakrender::ipc shim above). libc also powers
|
|
# the SIGSEGV crash hook (OAK_WORKER_CRASH_ON_TICKET) used by the crash-
|
|
# isolation integration tests.
|
|
libc = "0.2"
|
|
|
|
# M15 S1: real per-process rendering — the worker loads the project graph
|
|
# itself (oaknode::serializer) and runs nodes through the plugin runtime
|
|
# (oakplugin::node_factory::install_render_executor wires the CPU render
|
|
# executor). oakcodec/ocio-rs/ffmpeg arrive transitively through
|
|
# oaknode/oakplugin — the same single-lib unification the engine uses.
|
|
oak-core = { path = "../oak-core" }
|
|
oak-node = { path = "../oak-node" }
|
|
oak-plugin = { path = "../oak-plugin" }
|
|
|
|
# M14 R2 / M15 S1: oak-worker is a PURE module-crate consumer — the
|
|
# worker runtime (src/worker.rs) lives in this binary and calls the oak*
|
|
# rlibs directly. oakrender supplies the render backend, the CPU
|
|
# evaluation path and the shared ipc protocol (src/ipc.rs is a shim
|
|
# re-exporting oakrender::ipc). No liboakengine dylib, no C ABI, no
|
|
# build.rs link step.
|
|
oak-render = { path = "../oak-render" }
|
|
|
|
[dev-dependencies]
|
|
# oakcodec's test-media generator (`testmedia::write_test_clip`) for the
|
|
# graph-mode procpool integration tests — self-contained generated clips
|
|
# instead of repo fixtures. oakcodec already links in transitively via
|
|
# oaknode; this re-entry makes it nameable from the test binary.
|
|
oak-codec = { path = "../oak-codec" }
|