X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fpcm.rs;h=c0ef5d3bc1a2ab284aaa694a5557718c53831f7c;hb=86b51082f5aa5b94e40aec40c6963ec34071f9b5;hp=3bc67c007f04461ac2262c6504ba949d661d49fc;hpb=6f2630992fe340ad1a122ec10c649f756e478185;p=nihav.git diff --git a/nihav-commonfmt/src/codecs/pcm.rs b/nihav-commonfmt/src/codecs/pcm.rs index 3bc67c0..c0ef5d3 100644 --- a/nihav-commonfmt/src/codecs/pcm.rs +++ b/nihav-commonfmt/src/codecs/pcm.rs @@ -79,12 +79,12 @@ fn get_default_chmap(nch: u8) -> NAChannelMap { #[cfg(feature="decoder_pcm")] fn get_duration(ainfo: &NAAudioInfo, duration: Option, data_size: usize) -> u64 { - if duration == None { + if let Some(dur) = duration { + dur + } else { let size_bits = (data_size as u64) * 8; let blk_size = u64::from(ainfo.get_channels()) * u64::from(ainfo.get_format().get_bits()); size_bits / blk_size - } else { - duration.unwrap() } } @@ -200,6 +200,7 @@ impl NAEncoder for PCMEncoder { } } } + fn get_capabilities(&self) -> u64 { ENC_CAPS_CBR } fn init(&mut self, stream_id: u32, encinfo: EncodeParameters) -> EncoderResult { match encinfo.format { NACodecTypeInfo::None => Err(EncoderError::FormatError),