X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-core%2Fsrc%2Freorder.rs;h=625e759952caa7cfb656d7141cad7cc4b894dc61;hb=b36f412c24813b14cb2b1f8fd151863e2a49c1e2;hp=fe6670c85bba2c46fc97d104a5bc15cc0d0eeda6;hpb=f9c353971745ce681f5d56d419ae62aa1a04a3b9;p=nihav.git diff --git a/nihav-core/src/reorder.rs b/nihav-core/src/reorder.rs index fe6670c..625e759 100644 --- a/nihav-core/src/reorder.rs +++ b/nihav-core/src/reorder.rs @@ -1,23 +1,43 @@ +//! Output frame reordering. +//! +//! NihAV decoders output frames in the same order as they are put in. +//! In result if you want to have frames in display order you might need some frame reorderer. +//! This module provides such functionality depending on codec type: audio codecs and video codecs without B-frames do not need any reorderer and can use `NoReorderer` if the common interface is required. Codecs with B-frames should use `IPBReorderer`. For codecs with very complex reordering rules like H.264 or H.256 `PictureIDReorderer` will be added eventually. +//! +//! You can find out required reorderer by quering codec properties using `nihav_core::register` module. use std::mem::swap; pub use crate::frame::{FrameType, NAFrameRef}; +/// A trait for frame reorderer. pub trait FrameReorderer { + /// Stores a newly decoded frame. fn add_frame(&mut self, fref: NAFrameRef) -> bool; + /// Gets the next frame to be displayed (or `None` if that is not possible). fn get_frame(&mut self) -> Option; + /// Clears all stored frames. fn flush(&mut self); + /// Retrieves the last frames stored by the reorderer. fn get_last_frames(&mut self) -> Option; } +/// Zero reorderer. pub struct NoReorderer { fref: Option, } impl NoReorderer { + /// Constructs a new instance of `NoReorderer`. pub fn new() -> Self { Self { fref: None } } } +impl Default for NoReorderer { + fn default() -> Self { + Self::new() + } +} + impl FrameReorderer for NoReorderer { fn add_frame(&mut self, fref: NAFrameRef) -> bool { if self.fref.is_none() { @@ -36,6 +56,7 @@ impl FrameReorderer for NoReorderer { fn get_last_frames(&mut self) -> Option { None } } +/// Frame reorderer for codecs with I/P/B frames. #[derive(Default)] pub struct IPBReorderer { rframe: Option, @@ -43,6 +64,7 @@ pub struct IPBReorderer { } impl IPBReorderer { + /// Constructs a new instance of `IPBReorderer`. pub fn new() -> Self { Self::default() } }