diff options
author | metamuffin <metamuffin@disroot.org> | 2023-01-27 21:48:22 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2023-01-27 21:48:22 +0100 |
commit | a742f7dbd8bda0bf23a6d5273e5dd2f83b9d4c9f (patch) | |
tree | 49ba83ef7aec7b2bf4ff61b41c621696c45c6e95 /remuxer/src/import | |
parent | 04e3ebfdda613be0e58290a49536116cc57ad147 (diff) | |
download | jellything-a742f7dbd8bda0bf23a6d5273e5dd2f83b9d4c9f.tar jellything-a742f7dbd8bda0bf23a6d5273e5dd2f83b9d4c9f.tar.bz2 jellything-a742f7dbd8bda0bf23a6d5273e5dd2f83b9d4c9f.tar.zst |
clippy
Diffstat (limited to 'remuxer/src/import')
-rw-r--r-- | remuxer/src/import/mod.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/remuxer/src/import/mod.rs b/remuxer/src/import/mod.rs index 1ceca1e..c3dbf49 100644 --- a/remuxer/src/import/mod.rs +++ b/remuxer/src/import/mod.rs @@ -26,7 +26,7 @@ pub fn import_read(path: &PathBuf, input: &mut EbmlReader, iteminfo: &mut ItemIn match item { MatroskaTag::Ebml(_) => { let mut iter = Unflatten::new_with_end(input, item); - while let Some(Ok(Unflat { children: _, item })) = iter.next() { + while let Some(Ok(Unflat { children: _, item })) = iter.n() { match item { MatroskaTag::DocType(t) => { if !matches!(t.as_str(), "matroska" | "webm") { @@ -58,12 +58,12 @@ fn import_read_segment( let (mut timestamp_scale, mut duration) = (None, None); let mut seek_index = HashMap::new(); - while let Some(Ok(Unflat { children, item })) = children.next() { + while let Some(Ok(Unflat { children, item })) = children.n() { match item { MatroskaTag::SeekHead(_) => {} MatroskaTag::Info(_) => { let mut children = children.unwrap(); - while let Some(Ok(Unflat { children: _, item })) = children.next() { + while let Some(Ok(Unflat { children: _, item })) = children.n() { match item { MatroskaTag::TimestampScale(v) => timestamp_scale = Some(v), MatroskaTag::Duration(v) => duration = Some(v), @@ -76,7 +76,7 @@ fn import_read_segment( MatroskaTag::Chapters(_) => {} MatroskaTag::Tracks(_) => { let mut children = children.unwrap(); - while let Some(Ok(Unflat { children, item })) = children.next() { + while let Some(Ok(Unflat { children, item })) = children.n() { match item { MatroskaTag::TrackEntry(_) => { let mut children = children.unwrap(); @@ -98,7 +98,7 @@ fn import_read_segment( None, None, None, None, None, None, None, None, None, None, None, None, None, ); - while let Some(Ok(Unflat { children, item })) = children.next() { + while let Some(Ok(Unflat { children, item })) = children.n() { match item { MatroskaTag::CodecID(b) => codec = Some(b), MatroskaTag::Language(v) => language = Some(v), @@ -109,7 +109,7 @@ fn import_read_segment( MatroskaTag::DefaultDuration(v) => default_duration = Some(v), MatroskaTag::Audio(_) => { let mut children = children.unwrap(); - while let Some(Ok(Unflat { item, .. })) = children.next() { + while let Some(Ok(Unflat { item, .. })) = children.n() { match item { MatroskaTag::Channels(v) => { channels = Some(v as usize) @@ -124,7 +124,7 @@ fn import_read_segment( } MatroskaTag::Video(_) => { let mut children = children.unwrap(); - while let Some(Ok(Unflat { item, .. })) = children.next() { + while let Some(Ok(Unflat { item, .. })) = children.n() { match item { MatroskaTag::PixelWidth(v) => width = Some(v), MatroskaTag::PixelHeight(v) => height = Some(v), @@ -174,14 +174,14 @@ fn import_read_segment( let mut children = children.unwrap(); let mut pts = 0; - while let Some(Ok(Unflat { children, item })) = children.next() { + while let Some(Ok(Unflat { children, item })) = children.n() { match item { MatroskaTag::Timestamp(ts) => pts = ts, MatroskaTag::BlockGroup(_) => { debug!("group"); let mut children = children.unwrap(); let pos = children.position(); - while let Some(Ok(Unflat { children: _, item })) = children.next() { + while let Some(Ok(Unflat { children: _, item })) = children.n() { match item { MatroskaTag::Block(ref buf) => { let block = Block::parse(buf)?; @@ -231,12 +231,12 @@ fn import_read_segment( for (tn, index) in seek_index { bincode::encode_into_std_write( index, - &mut File::create(path.with_extension(&format!("si.{}", tn)))?, + &mut File::create(path.with_extension(&format!("si.{tn}")))?, bincode::config::standard(), )?; } iteminfo.duration = - (duration.unwrap() * timestamp_scale.unwrap() as f64) as f64 / 1_000_000_000 as f64; + (duration.unwrap() * timestamp_scale.unwrap() as f64) / 1_000_000_000_f64; Ok(()) } |