X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-ms%2Fsrc%2Fcodecs%2Fmsadpcm.rs;h=6b6c63e699734ec7da0d8811bb270a2ad8a98a1b;hb=886cde4847280b96e10d240c2f2d76abec121dc8;hp=a63f4e5a4b9d5661885564d25e5d9ba3199e6f8c;hpb=379524159c95f1c3639976ccf35f9d47cd9732ac;p=nihav.git diff --git a/nihav-ms/src/codecs/msadpcm.rs b/nihav-ms/src/codecs/msadpcm.rs index a63f4e5..6b6c63e 100644 --- a/nihav-ms/src/codecs/msadpcm.rs +++ b/nihav-ms/src/codecs/msadpcm.rs @@ -37,6 +37,7 @@ impl Predictor { } } +#[cfg(feature="decoder_ms_adpcm")] struct MSADPCMDecoder { ainfo: NAAudioInfo, chmap: NAChannelMap, @@ -45,6 +46,7 @@ struct MSADPCMDecoder { block_samps: usize, } +#[cfg(feature="decoder_ms_adpcm")] impl MSADPCMDecoder { fn new() -> Self { Self { @@ -57,6 +59,7 @@ impl MSADPCMDecoder { } } +#[cfg(feature="decoder_ms_adpcm")] impl NADecoder for MSADPCMDecoder { #[allow(clippy::int_plus_one)] fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { @@ -162,17 +165,20 @@ impl NADecoder for MSADPCMDecoder { } } +#[cfg(feature="decoder_ms_adpcm")] impl NAOptionHandler for MSADPCMDecoder { fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } fn set_options(&mut self, _options: &[NAOption]) { } fn query_option_value(&self, _name: &str) -> Option { None } } +#[cfg(feature="decoder_ms_adpcm")] pub fn get_decoder() -> Box { Box::new(MSADPCMDecoder::new()) } #[derive(Default)] +#[cfg(feature="encoder_ms_adpcm")] struct MSADPCMEncoder { stream: Option, samples: Vec, @@ -182,8 +188,10 @@ struct MSADPCMEncoder { srate: u32, } +#[cfg(feature="encoder_ms_adpcm")] const DEFAULT_BLOCK_LEN: usize = 256; +#[cfg(feature="encoder_ms_adpcm")] impl MSADPCMEncoder { fn new() -> Self { Self::default() } fn encode_packet(&mut self) -> EncoderResult { @@ -297,6 +305,7 @@ impl MSADPCMEncoder { } } +#[cfg(feature="encoder_ms_adpcm")] impl NAEncoder for MSADPCMEncoder { fn negotiate_format(&self, encinfo: &EncodeParameters) -> EncoderResult { match encinfo.format { @@ -394,12 +403,14 @@ impl NAEncoder for MSADPCMEncoder { } } +#[cfg(feature="encoder_ms_adpcm")] impl NAOptionHandler for MSADPCMEncoder { fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } fn set_options(&mut self, _options: &[NAOption]) { } fn query_option_value(&self, _name: &str) -> Option { None } } +#[cfg(feature="encoder_ms_adpcm")] pub fn get_encoder() -> Box { Box::new(MSADPCMEncoder::new()) } @@ -437,6 +448,7 @@ mod test { let mut enc_reg = RegisteredEncoders::new(); ms_register_all_encoders(&mut enc_reg); + // sample: https://samples.mplayerhq.hu/V-codecs/RT21/320x240/laser05.avi let dec_config = DecoderTestParams { demuxer: "avi", in_name: "assets/Indeo/laser05.avi",