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.
31 lines
1.2 KiB
TOML
31 lines
1.2 KiB
TOML
[package]
|
|
name = "oak-codec"
|
|
version.workspace = true
|
|
edition = "2021"
|
|
description = "Oak Video Editor media codec module (Rust)"
|
|
license = "GPL-3.0-or-later"
|
|
|
|
[lib]
|
|
crate-type = ["staticlib", "rlib"]
|
|
|
|
[dependencies]
|
|
oak-ffmpeg-link = { path = "../oak-ffmpeg-link" }
|
|
oak-core = { path = "../oak-core" }
|
|
# Real media decode/encode. The C++ ffmpeg_bridge library existed only to
|
|
# absorb FFmpeg API churn; the Rust crate calls ffmpeg-next directly.
|
|
#
|
|
# ffmpeg-next 9.x pairs with FFmpeg 8.x headers, which most distros do
|
|
# not ship yet — build a matching GPL FFmpeg (all free-license codecs +
|
|
# per-OS hardware acceleration, static+PIC) with
|
|
# tooling/ffmpeg/build-ffmpeg.sh and point cargo at it via FFMPEG_DIR
|
|
# (see docs/build.md). The `static` feature makes the linker prefer the
|
|
# archives.
|
|
#
|
|
# ffmpeg-next's own `build` feature is NOT usable: it clones
|
|
# release/<crate-version>, and every such pairing is broken upstream
|
|
# (9.0.0 -> FFmpeg 9.0 removed AVCodec fields; 8.1.0 -> FFmpeg 8.1 added
|
|
# enum variants; 8.0.0 -> FFmpeg 8.0 renamed FF_PROFILE_*).
|
|
ffmpeg-next = { version = "9.0", features = ["static"] }
|
|
# `std::error::Error` impls for the crate-internal error enum.
|
|
thiserror = "2"
|