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.
85 lines
2.8 KiB
Rust
85 lines
2.8 KiB
Rust
// Oak Video Editor - 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/>.
|
|
|
|
//! Error codes, mirroring `include/render/error.h` verbatim; project-wide
|
|
//! -MMCCCC scheme (module registry in include/common/error.h), pass-through untranslated.
|
|
//!
|
|
//! With the oak-common/oak-core merge the render value/GPU types moved into
|
|
//! `oak-core`, so this crate no longer carries its own error enum:
|
|
//! [`Error`]/[`Result`] are re-exported from [`oak_core::error`] (identical
|
|
//! variant shape and messages). The `OAKRENDER_*` codes below remain as the
|
|
//! module's public-code contract; `Error::code()` reports the unified
|
|
//! `OAKCORE_*` values.
|
|
|
|
/// Success.
|
|
pub const OAKRENDER_OK: i32 = 0;
|
|
/// Null handle or invalid argument.
|
|
pub const OAKRENDER_E_INVALID: i32 = -70001;
|
|
/// Call not valid in the current state.
|
|
pub const OAKRENDER_E_STATE: i32 = -70002;
|
|
/// The underlying operation failed.
|
|
pub const OAKRENDER_E_FAILED: i32 = -70003;
|
|
/// Index out of range / entry not found.
|
|
pub const OAKRENDER_E_NOT_FOUND: i32 = -70004;
|
|
/// Allocation failed.
|
|
pub const OAKRENDER_E_NOMEM: i32 = -70005;
|
|
|
|
pub use oak_core::error::{Error, Result};
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
/// Every variant must produce a non-empty `Display` message; the
|
|
/// `Failed` variant must surface its context string.
|
|
#[test]
|
|
fn display_is_non_empty() {
|
|
for msg in [
|
|
Error::Invalid.to_string(),
|
|
Error::State.to_string(),
|
|
Error::Failed("context".into()).to_string(),
|
|
Error::NotFound.to_string(),
|
|
Error::NoMem.to_string(),
|
|
] {
|
|
assert!(!msg.trim().is_empty(), "empty Display message");
|
|
}
|
|
assert!(
|
|
Error::Failed("context".into())
|
|
.to_string()
|
|
.contains("context")
|
|
);
|
|
}
|
|
|
|
/// `Error` must be usable behind a trait object.
|
|
#[test]
|
|
fn error_is_object_safe() {
|
|
let errs: Vec<Box<dyn std::error::Error>> = vec![
|
|
Box::new(Error::Invalid),
|
|
Box::new(Error::State),
|
|
Box::new(Error::Failed("context".into())),
|
|
Box::new(Error::NotFound),
|
|
Box::new(Error::NoMem),
|
|
];
|
|
assert_eq!(errs.len(), 5);
|
|
}
|
|
|
|
/// No variant wraps a downstream error, so `source()` stays `None`.
|
|
#[test]
|
|
fn source_is_none() {
|
|
assert!(std::error::Error::source(&Error::Failed("context".into())).is_none());
|
|
}
|
|
}
|