Const Formats

Author: animafps

rustsynth/src/format/audio.rs

@@ -56,23 +56,6 @@ impl AudioFormatBuilder {
     }
 }
 
-impl AudioFormat {
-    /// Convenience method to create common 16-bit stereo format
-    pub fn stereo_16bit(core: &crate::core::CoreRef) -> Result<Self, FormatError> {
-        AudioFormatBuilder::new(SampleType::Integer, 16, ChannelLayout::STEREO).build(core)
-    }
-
-    /// Convenience method to create common 32-bit float stereo format
-    pub fn stereo_32bit_float(core: &crate::core::CoreRef) -> Result<Self, FormatError> {
-        AudioFormatBuilder::new(SampleType::Float, 32, ChannelLayout::STEREO).build(core)
-    }
-
-    /// Convenience method to create common 16-bit mono format
-    pub fn mono_16bit(core: &crate::core::CoreRef) -> Result<Self, FormatError> {
-        AudioFormatBuilder::new(SampleType::Integer, 16, ChannelLayout::MONO).build(core)
-    }
-}
-
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub struct AudioInfo {
     pub format: AudioFormat,
@@ -186,4 +169,20 @@ impl AudioFormat {
     pub fn get_name(&self) -> Option<String> {
         unsafe { API::get_cached().get_audio_format_name(&self.as_ptr()) }
     }
+
+    pub const STEREO16: Self = Self {
+        sample_type: SampleType::Integer,
+        bits_per_sample: 16,
+        bytes_per_sample: 2,
+        num_channels: 2,
+        channel_layout: ChannelLayout::STEREO,
+    };
+
+    pub const MONO16: Self = Self {
+        sample_type: SampleType::Integer,
+        bits_per_sample: 16,
+        bytes_per_sample: 2,
+        num_channels: 1,
+        channel_layout: ChannelLayout::MONO,
+    };
 }

rustsynth/src/format/enums.rs

@@ -8,7 +8,7 @@ pub enum MediaType {
     Audio,
 }
 
-/// Audio channel layout bitmask using VSAudioChannels constants
+/// Audio channel layout bitmask
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub struct ChannelLayout(pub u64);
 

rustsynth/src/format/presets.rs

@@ -1,5 +1,5 @@
-use crate::format::{ColorFamily, SampleType};
-/// Preset video formats as defined by VapourSynth.
+use crate::{core::CoreRef, format::{ColorFamily, SampleType, VideoFormat}};
+/// Preset video format IDs as defined by VapourSynth.
 ///
 /// The presets suffixed with H and S have floating point sample type. The H and S suffixes stand
 /// for half precision and single precision, respectively.
@@ -77,3 +77,10 @@ const fn make_video_id(
         | (sub_sampling_w << 8)
         | sub_sampling_h
 }
+
+impl PresetVideoFormat {
+    /// Consumes the PresetVideoFormatID and returns the corresponding VideoFormat from the core.
+    pub fn into_format(self, core: &CoreRef) -> VideoFormat {
+        core.get_video_format_by_id(self as u32).unwrap()
+    }
+}

rustsynth/src/format/video.rs

@@ -106,6 +106,46 @@ impl VideoFormat {
     pub fn get_name(&self) -> Option<String> {
         unsafe { API::get_cached().get_video_format_name(&self.as_ptr()) }
     }
+
+    pub const YUV420P8: Self = Self {
+        color_family: ColorFamily::YUV,
+        sample_type: SampleType::Integer,
+        bits_per_sample: 8,
+        bytes_per_sample: 1,
+        sub_sampling_w: 2,
+        sub_sampling_h: 2,
+        num_planes: 3,
+    };
+
+    pub const YUV444P8: Self = Self {
+        color_family: ColorFamily::YUV,
+        sample_type: SampleType::Integer,
+        bits_per_sample: 8,
+        bytes_per_sample: 1,
+        sub_sampling_w: 1,
+        sub_sampling_h: 1,
+        num_planes: 3,
+    };
+
+    pub const RGB24: Self = Self {
+        color_family: ColorFamily::RGB,
+        sample_type: SampleType::Integer,
+        bits_per_sample: 8,
+        bytes_per_sample: 1,
+        sub_sampling_w: 0,
+        sub_sampling_h: 0,
+        num_planes: 3,
+    };
+
+    pub const GRAY8: Self = Self {
+        color_family: ColorFamily::Gray,
+        sample_type: SampleType::Integer,
+        bits_per_sample: 8,
+        bytes_per_sample: 1,
+        sub_sampling_w: 0,
+        sub_sampling_h: 0,
+        num_planes: 1,
+    };
 }
 
 impl VideoInfo {
@@ -197,28 +237,6 @@ impl VideoFormatBuilder {
     }
 }
 
-impl VideoFormat {
-    /// Convenience method to create common YUV420P8 format
-    pub fn yuv420p8(core: &crate::core::CoreRef) -> Result<Self, FormatError> {
-        Self::query(ColorFamily::YUV, SampleType::Integer, 8, 1, 1, core)
-    }
-
-    /// Convenience method to create common YUV444P8 format
-    pub fn yuv444p8(core: &crate::core::CoreRef) -> Result<Self, FormatError> {
-        Self::query(ColorFamily::YUV, SampleType::Integer, 8, 0, 0, core)
-    }
-
-    /// Convenience method to create common RGB24 format
-    pub fn rgb24(core: &crate::core::CoreRef) -> Result<Self, FormatError> {
-        Self::query(ColorFamily::RGB, SampleType::Integer, 8, 0, 0, core)
-    }
-
-    /// Convenience method to create common Gray8 format
-    pub fn gray8(core: &crate::core::CoreRef) -> Result<Self, FormatError> {
-        Self::query(ColorFamily::Gray, SampleType::Integer, 8, 0, 0, core)
-    }
-}
-
 /// Information about a video clip
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub struct VideoInfo {