From 46008a8f24f0aaa65252c7ba9efccc7af10ebb31 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Thu, 13 Mar 2025 18:28:33 +0100 Subject: [PATCH] Introduce muxer quirks This will allow nihav-encoder to deal better with certain peculiarities of some formats in more generic way (e.g. make sure Bink muxer gets the number of output frames or enforce fixed frame rate on transcoding to AVI). --- nihav-commonfmt/src/muxers/avi.rs | 1 + nihav-commonfmt/src/muxers/gif.rs | 1 + nihav-commonfmt/src/muxers/wav.rs | 1 + nihav-commonfmt/src/muxers/y4m.rs | 1 + nihav-core/src/muxers/mod.rs | 41 ++++++++++++++++++++++++++ nihav-flash/src/muxers/flv.rs | 1 + nihav-game/src/muxers/ea.rs | 1 + nihav-llaudio/src/muxers/flac.rs | 1 + nihav-rad/src/muxers/bink.rs | 1 + nihav-realmedia/src/muxers/rmvb/mod.rs | 2 ++ 10 files changed, 51 insertions(+) diff --git a/nihav-commonfmt/src/muxers/avi.rs b/nihav-commonfmt/src/muxers/avi.rs index 136d255..972a7ca 100644 --- a/nihav-commonfmt/src/muxers/avi.rs +++ b/nihav-commonfmt/src/muxers/avi.rs @@ -356,6 +356,7 @@ impl MuxerCreator for AVIMuxerCreator { } fn get_name(&self) -> &'static str { "avi" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::Universal } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks(MUX_QUIRK_FIXED_RATE) } } #[cfg(test)] diff --git a/nihav-commonfmt/src/muxers/gif.rs b/nihav-commonfmt/src/muxers/gif.rs index 435d1b8..13ca818 100644 --- a/nihav-commonfmt/src/muxers/gif.rs +++ b/nihav-commonfmt/src/muxers/gif.rs @@ -195,6 +195,7 @@ impl MuxerCreator for GIFMuxerCreator { } fn get_name(&self) -> &'static str { "gif" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::SingleVideo("gif") } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks(MUX_QUIRK_FIXED_RATE) } } #[cfg(test)] diff --git a/nihav-commonfmt/src/muxers/wav.rs b/nihav-commonfmt/src/muxers/wav.rs index 1317b95..5b20677 100644 --- a/nihav-commonfmt/src/muxers/wav.rs +++ b/nihav-commonfmt/src/muxers/wav.rs @@ -112,6 +112,7 @@ impl MuxerCreator for WAVMuxerCreator { } fn get_name(&self) -> &'static str { "wav" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::SingleAudio("any") } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks::new() } } #[cfg(test)] diff --git a/nihav-commonfmt/src/muxers/y4m.rs b/nihav-commonfmt/src/muxers/y4m.rs index 600f78e..1d0ad38 100644 --- a/nihav-commonfmt/src/muxers/y4m.rs +++ b/nihav-commonfmt/src/muxers/y4m.rs @@ -83,6 +83,7 @@ impl MuxerCreator for Y4MMuxerCreator { } fn get_name(&self) -> &'static str { "yuv4mpeg" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::SingleVideo("rawvideo") } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks(MUX_QUIRK_FIXED_RATE) } } #[cfg(test)] diff --git a/nihav-core/src/muxers/mod.rs b/nihav-core/src/muxers/mod.rs index eb71df5..4df7c4a 100644 --- a/nihav-core/src/muxers/mod.rs +++ b/nihav-core/src/muxers/mod.rs @@ -54,6 +54,45 @@ impl From for MuxerError { fn from(_: ByteIOError) -> Self { MuxerError::IOError } } +/// Muxer quirks (i.e. peculiarities in muxer behaviour like accepting only frames of fixed duration) +#[derive(Clone,Copy,Default)] +pub struct MuxerQuirks(pub u32); + +/// Muxer expects all packets of one stream to have the same duration. +pub const MUX_QUIRK_FIXED_RATE: u32 = 1 << 0; +/// Muxer expects to know full duration in advance. +pub const MUX_QUIRK_FIXED_DURATION: u32 = 1 << 1; +/// Muxer does not care about synchronisation of the stream. +pub const MUX_QUIRK_UNSYNC: u32 = 1 << 2; + +impl MuxerQuirks { + /// Creates a new instance of `MuxerQuirks` + pub fn new() -> Self { Self::default() } + + /// Queries if the muxer expects all packets of one stream to have the same duration. + pub fn is_fixed_rate(self) -> bool { (self.0 & MUX_QUIRK_FIXED_RATE) != 0 } + /// Tells that muxer expects all packets of one stream to have the same duration. + pub fn set_fixed_rate(&mut self) { self.0 |= MUX_QUIRK_FIXED_RATE; } + /// Tells that muxer does not expect all packets of one stream to have the same duration. + pub fn clear_fixed_rate(&mut self) { self.0 &= !MUX_QUIRK_FIXED_RATE; } + + /// Queries if the muxer expects to know full duration in advance. + pub fn is_fixed_duration(self) -> bool { (self.0 & MUX_QUIRK_FIXED_DURATION) != 0 } + /// Tells that muxer expects to know full duration in advance. + pub fn set_fixed_duration(&mut self) { self.0 |= MUX_QUIRK_FIXED_DURATION; } + /// Tells that muxer does not expect to know full duration in advance. + pub fn clear_fixed_duration(&mut self) { self.0 &= !MUX_QUIRK_FIXED_DURATION; } + + + /// Queries if the muxer does not care about stream synchronisation. + pub fn is_unsync(self) -> bool { (self.0 & MUX_QUIRK_UNSYNC) != 0 } + /// Tells that muxer does not care about stream synchronisation. + pub fn set_unsync(&mut self) { self.0 |= MUX_QUIRK_UNSYNC; } + /// Tells that muxer actually cares about streams being synchronised. + pub fn clear_unsync(&mut self) { self.0 &= !MUX_QUIRK_UNSYNC; } +} + + /// A trait for muxing operations. pub trait MuxCore<'a>: NAOptionHandler { /// Prepares everything for packet muxing. @@ -131,6 +170,8 @@ pub trait MuxerCreator { fn get_name(&self) -> &'static str; /// Returns muxer capabilities for the current muxer. fn get_capabilities(&self) -> MuxerCapabilities; + /// Returns current muxer quirks. + fn get_quirks(&self) -> MuxerQuirks; } /// Creates muxer for a provided bytestream writer. diff --git a/nihav-flash/src/muxers/flv.rs b/nihav-flash/src/muxers/flv.rs index 3ff9bee..2ab2c5b 100644 --- a/nihav-flash/src/muxers/flv.rs +++ b/nihav-flash/src/muxers/flv.rs @@ -287,6 +287,7 @@ impl MuxerCreator for FLVMuxerCreator { } fn get_name(&self) -> &'static str { "flv" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::SingleVideoAndAudio("any", "any") } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks::new() } } #[cfg(test)] diff --git a/nihav-game/src/muxers/ea.rs b/nihav-game/src/muxers/ea.rs index 8a48165..3aa4212 100644 --- a/nihav-game/src/muxers/ea.rs +++ b/nihav-game/src/muxers/ea.rs @@ -123,6 +123,7 @@ impl MuxerCreator for EAMuxerCreator { } fn get_name(&self) -> &'static str { "ea" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::OnlyVideo } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks(MUX_QUIRK_FIXED_RATE) } } #[cfg(test)] diff --git a/nihav-llaudio/src/muxers/flac.rs b/nihav-llaudio/src/muxers/flac.rs index fb54a89..130aaeb 100644 --- a/nihav-llaudio/src/muxers/flac.rs +++ b/nihav-llaudio/src/muxers/flac.rs @@ -94,6 +94,7 @@ impl MuxerCreator for FLACMuxerCreator { } fn get_name(&self) -> &'static str { "flac" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::SingleAudio("flac") } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks::new() } } #[cfg(test)] diff --git a/nihav-rad/src/muxers/bink.rs b/nihav-rad/src/muxers/bink.rs index 3a7240d..adf8af7 100644 --- a/nihav-rad/src/muxers/bink.rs +++ b/nihav-rad/src/muxers/bink.rs @@ -236,6 +236,7 @@ impl MuxerCreator for BinkMuxerCreator { } fn get_name(&self) -> &'static str { "bink" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::Universal } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks(MUX_QUIRK_FIXED_RATE | MUX_QUIRK_FIXED_DURATION) } } #[cfg(test)] diff --git a/nihav-realmedia/src/muxers/rmvb/mod.rs b/nihav-realmedia/src/muxers/rmvb/mod.rs index 1d08f4d..f8bdaa2 100644 --- a/nihav-realmedia/src/muxers/rmvb/mod.rs +++ b/nihav-realmedia/src/muxers/rmvb/mod.rs @@ -406,6 +406,7 @@ impl MuxerCreator for RealMediaMuxerCreator { } fn get_name(&self) -> &'static str { "realmedia" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::Universal } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks::new() } } struct RAMuxer<'a> { @@ -473,6 +474,7 @@ impl MuxerCreator for RealAudioMuxerCreator { } fn get_name(&self) -> &'static str { "realaudio" } fn get_capabilities(&self) -> MuxerCapabilities { MuxerCapabilities::SingleAudio("any") } + fn get_quirks(&self) -> MuxerQuirks { MuxerQuirks::new() } } #[cfg(test)] -- 2.39.5