diff options
author | metamuffin <metamuffin@disroot.org> | 2023-01-18 16:16:03 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2023-01-18 16:16:03 +0100 |
commit | 46ef75431e1d34c63a690726a8ef584d175ddd30 (patch) | |
tree | df36a2bfb9fe3e19ce9f76665b4770063a089423 /remuxer | |
parent | 5aa557e864bd2cf940e7164b7568e7e545817306 (diff) | |
download | jellything-46ef75431e1d34c63a690726a8ef584d175ddd30.tar jellything-46ef75431e1d34c63a690726a8ef584d175ddd30.tar.bz2 jellything-46ef75431e1d34c63a690726a8ef584d175ddd30.tar.zst |
restructure pages slightly
Diffstat (limited to 'remuxer')
-rw-r--r-- | remuxer/src/import/mod.rs | 4 | ||||
-rw-r--r-- | remuxer/src/lib.rs | 24 |
2 files changed, 13 insertions, 15 deletions
diff --git a/remuxer/src/import/mod.rs b/remuxer/src/import/mod.rs index 91a6408..5147a05 100644 --- a/remuxer/src/import/mod.rs +++ b/remuxer/src/import/mod.rs @@ -21,7 +21,7 @@ pub fn import_read(input: &mut EbmlReader, iteminfo: &mut ItemInfo) -> Result<() 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.next() { match item { MatroskaTag::DocType(t) => { if !matches!(t.as_str(), "matroska" | "webm") { @@ -99,7 +99,7 @@ fn import_read_segment(children: &mut Unflatten, iteminfo: &mut ItemInfo) -> Res match item { MatroskaTag::CuePoint(_) => { let mut children = children.unwrap(); - while let Some(Ok(Unflat { children: _, item })) = children.next() { + while let Some(Ok(Unflat { children: _, item: _ })) = children.next() { // error!("{item:?}") } } diff --git a/remuxer/src/lib.rs b/remuxer/src/lib.rs index bc0aff7..21b41bb 100644 --- a/remuxer/src/lib.rs +++ b/remuxer/src/lib.rs @@ -7,17 +7,11 @@ use jellymatroska::{ block::Block, read::EbmlReader, unflatten::{Unflat, Unflatten}, - write::{write_vint, EbmlWriter}, + write::EbmlWriter, Master, MatroskaTag, }; -use log::{debug, error, info, trace, warn}; -use std::{ - collections::{BTreeMap, HashMap}, - fs::File, - io::Write, - path::PathBuf, - sync::Arc, -}; +use log::{debug, info, trace, warn}; +use std::{collections::BTreeMap, fs::File, io::Write, path::PathBuf, sync::Arc}; pub struct RemuxerContext {} @@ -29,7 +23,7 @@ impl RemuxerContext { pub fn generate_into( &self, writer: impl Write + 'static, - offset: usize, + _offset: usize, path_base: PathBuf, iteminfo: ItemInfo, selection: Vec<u64>, @@ -113,7 +107,7 @@ impl RemuxerContext { fn filter_segment( children: &mut Unflatten, writer: &mut EbmlWriter, - iteminfo: &ItemInfo, + _iteminfo: &ItemInfo, mapping: &BTreeMap<u64, u64>, ) -> Result<()> { while let Some(Ok(Unflat { children, item })) = children.next() { @@ -134,7 +128,7 @@ fn filter_segment( debug!("group"); let mut children = children.unwrap(); let mut group = vec![]; - while let Some(Ok(Unflat { children, item })) = children.next() { + while let Some(Ok(Unflat { children: _, item })) = children.next() { match item { MatroskaTag::Block(buf) => { let mut block = Block::parse(&buf)?; @@ -190,7 +184,11 @@ pub fn track_to_ebml(number: u64, track: &SourceTrack) -> MatroskaTag { els.push(MatroskaTag::DefaultDuration(*d)); } match track.kind { - SourceTrackKind::Video { width, height, fps } => { + SourceTrackKind::Video { + width, + height, + fps: _, + } => { els.push(MatroskaTag::TrackType(1)); els.push(MatroskaTag::DefaultDuration(41708333)); // TODO pls not hardcoded els.push(MatroskaTag::Video(Master::Collected(vec![ |