projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix clippy warnings
[nihav.git]
/
nihav-commonfmt
/
src
/
codecs
/
pcm.rs
diff --git
a/nihav-commonfmt/src/codecs/pcm.rs
b/nihav-commonfmt/src/codecs/pcm.rs
index b2dd8174879e75bc9f518fb5cca2e1255d5f8291..c0ef5d3bc1a2ab284aaa694a5557718c53831f7c 100644
(file)
--- 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<u64>, data_size: usize) -> u64 {
#[cfg(feature="decoder_pcm")]
fn get_duration(ainfo: &NAAudioInfo, duration: Option<u64>, 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
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()
}
}
}
}