diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-11-09 14:12:18 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-11-09 14:12:18 +0100 |
| commit | 2efc5f9444402c5ef9db25887f2e95d184af8e05 (patch) | |
| tree | 07f317780bdbe87d633e5340fe87bc604484730d /remuxer | |
| parent | 6032bfd0fa7cfd10d1bc17e44f91a789aa86efad (diff) | |
| download | jellything-2efc5f9444402c5ef9db25887f2e95d184af8e05.tar jellything-2efc5f9444402c5ef9db25887f2e95d184af8e05.tar.bz2 jellything-2efc5f9444402c5ef9db25887f2e95d184af8e05.tar.zst | |
upgrade deps + clippy
Diffstat (limited to 'remuxer')
| -rw-r--r-- | remuxer/Cargo.toml | 6 | ||||
| -rw-r--r-- | remuxer/src/demuxers/flac.rs | 2 | ||||
| -rw-r--r-- | remuxer/src/demuxers/matroska.rs | 8 | ||||
| -rw-r--r-- | remuxer/src/muxers/matroska.rs | 5 |
4 files changed, 10 insertions, 11 deletions
diff --git a/remuxer/Cargo.toml b/remuxer/Cargo.toml index a8fd18f..4731411 100644 --- a/remuxer/Cargo.toml +++ b/remuxer/Cargo.toml @@ -6,12 +6,12 @@ edition = "2024" [dependencies] hex = "0.4.3" -anyhow = "1.0.95" +anyhow = "1.0.100" env_logger = "0.11.8" log = { workspace = true } -serde = { version = "1.0.217", features = ["derive"] } -bincode = { version = "2.0.0-rc.3", features = ["serde"] } +serde = { version = "1.0.228", features = ["derive"] } +bincode = { version = "2.0.1", features = ["serde"] } winter-ebml = { git = "https://codeberg.org/metamuffin/ebml-rs", package = "ebml" } winter-matroska = { git = "https://codeberg.org/metamuffin/ebml-rs", package = "matroska", features = [ diff --git a/remuxer/src/demuxers/flac.rs b/remuxer/src/demuxers/flac.rs index 8e3fecc..c309589 100644 --- a/remuxer/src/demuxers/flac.rs +++ b/remuxer/src/demuxers/flac.rs @@ -97,7 +97,7 @@ impl FlacDemuxer { self.first_frame_offset = self.reader.stream_position()?; self.metadata = Some(blocks); - return Ok(self.metadata.as_ref().unwrap()); + Ok(self.metadata.as_ref().unwrap()) } fn stream_info(&mut self) -> Result<StreamInfo> { let m = self.read_metadata()?; diff --git a/remuxer/src/demuxers/matroska.rs b/remuxer/src/demuxers/matroska.rs index 923db81..bb7289a 100644 --- a/remuxer/src/demuxers/matroska.rs +++ b/remuxer/src/demuxers/matroska.rs @@ -79,7 +79,7 @@ impl MatroskaDemuxer { } /// Parse SeekHead at segment start if exists - pub fn seek_head<'a>(&'a mut self) -> Result<Option<&'a SeekHead>> { + pub fn seek_head(&mut self) -> Result<Option<&SeekHead>> { if self.seek_head.is_some() { return Ok(self.seek_head.as_ref()); } @@ -106,7 +106,7 @@ impl MatroskaDemuxer { let Some(segment_position) = seek_head .seeks .iter() - .find(|s| read_vint_slice(&mut s.id.as_slice()).map_or(false, |x| x == search_tag)) + .find(|s| read_vint_slice(&mut s.id.as_slice()) == Some(search_tag)) .map(|s| s.position) else { return Ok(None); @@ -159,9 +159,9 @@ impl MatroskaDemuxer { } impl Demuxer for MatroskaDemuxer { fn info(&mut self) -> Result<Info> { - Ok(self + self .read_segment_tag("Info", Segment::TAG_INFO)? - .ok_or(anyhow!("info missing"))?) + .ok_or(anyhow!("info missing")) } fn tracks(&mut self) -> Result<Option<Tracks>> { self.read_segment_tag("Tracks", Segment::TAG_TRACKS) diff --git a/remuxer/src/muxers/matroska.rs b/remuxer/src/muxers/matroska.rs index 228f420..e1216df 100644 --- a/remuxer/src/muxers/matroska.rs +++ b/remuxer/src/muxers/matroska.rs @@ -13,8 +13,8 @@ use winter_matroska::{MatroskaFile, Segment}; fn write_fragment_shared(out: &mut dyn Write, mut segment: Segment, webm: bool) -> Result<()> { segment.info.muxing_app = concat!(env!("CARGO_PKG_NAME"), "-", env!("CARGO_PKG_VERSION")).to_string(); - if webm { - if let Some(tracks) = &mut segment.tracks { + if webm + && let Some(tracks) = &mut segment.tracks { for track in &mut tracks.entries { if let Some(video) = &mut track.video { video.colour = None; @@ -25,7 +25,6 @@ fn write_fragment_shared(out: &mut dyn Write, mut segment: Segment, webm: bool) } } } - } let file = MatroskaFile { ebml_header: EbmlHeader { |