diff --git a/src/api/config/mod.rs b/src/api/config/mod.rs index 0ab0a0699d..21eff85bd0 100644 --- a/src/api/config/mod.rs +++ b/src/api/config/mod.rs @@ -29,7 +29,7 @@ pub use rate::{RateControlConfig, RateControlSummary}; mod speedsettings; pub use speedsettings::*; -pub use crate::tiling::{TilingInfo, MAX_TILE_RATE}; +pub use crate::tiling::TilingInfo; /// Enumeration of possible invalid configuration errors. #[derive(Debug, Clone, Copy, Eq, PartialEq, Error)] @@ -95,14 +95,6 @@ pub enum InvalidConfig { /// The maximal supported value. max: u64, }, - /// Framerate is invalid. - #[error("invalid framerate {actual} (expected > 0, <= {max})")] - InvalidFrameRate { - /// The actual value. - actual: u64, - /// The maximal supported value. - max: u64, - }, /// Reservoir frame delay is invalid. #[error("invalid reservoir frame delay {0} (expected >= 12, <= 131072)")] InvalidReservoirFrameDelay(i32), @@ -383,15 +375,6 @@ impl Config { }); } - let max_frame_rate = MAX_TILE_RATE / (config.width * config.height) as f64; - - if config.time_base.den / config.time_base.num > max_frame_rate as u64 { - return Err(InvalidFrameRate { - actual: config.time_base.den / config.time_base.num, - max: max_frame_rate as u64, - }); - } - if let Some(delay) = config.reservoir_frame_delay { if !(12..=131_072).contains(&delay) { return Err(InvalidReservoirFrameDelay(delay)); @@ -475,50 +458,3 @@ impl Config { Ok(seq.tiling) } } - -#[cfg(test)] -mod tests { - use crate::tiling::MAX_TILE_RATE; - use crate::{Config, EncoderConfig, InvalidConfig}; - - #[test] - fn invalid_frame_rate() { - let mut enc_config = EncoderConfig::default(); - enc_config.width = 1280; - enc_config.height = 720; - - // Test exceeding the maximum by 1. - enc_config.time_base.num = 1; - enc_config.time_base.den = - (MAX_TILE_RATE / (enc_config.width * enc_config.height) as f64) as u64 - + 1u64; - { - let config = Config::new().with_encoder_config(enc_config.clone()); - assert!(matches!( - config.validate(), - Err(InvalidConfig::InvalidFrameRate { .. }) - )); - } - - // Test 0 in the denominator. - enc_config.time_base.den = 0; - { - let config = Config::new().with_encoder_config(enc_config.clone()); - assert!(matches!( - config.validate(), - Err(InvalidConfig::InvalidFrameRateDen { .. }) - )); - } - - // Test 0 in the numerator. - enc_config.time_base.num = 0; - enc_config.time_base.den = 1; - { - let config = Config::new().with_encoder_config(enc_config.clone()); - assert!(matches!( - config.validate(), - Err(InvalidConfig::InvalidFrameRateNum { .. }) - )); - } - } -}