aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-01-15 00:01:05 +0100
committermetamuffin <metamuffin@disroot.org>2023-01-15 00:01:05 +0100
commitf9062d6d11cde9356f6cf213d5359d1d9ae7bb9e (patch)
treea99edf09b518a0c4da9caa5183d5c6d5f8e434b8
parent943ffe0d1dc2addf2f4f5db781e3d83c900b372d (diff)
downloadjellything-f9062d6d11cde9356f6cf213d5359d1d9ae7bb9e.tar
jellything-f9062d6d11cde9356f6cf213d5359d1d9ae7bb9e.tar.bz2
jellything-f9062d6d11cde9356f6cf213d5359d1d9ae7bb9e.tar.zst
not collecting… too hard
-rw-r--r--ebml/src/bin/experiment.rs2
-rw-r--r--ebml/src/read.rs12
2 files changed, 1 insertions, 13 deletions
diff --git a/ebml/src/bin/experiment.rs b/ebml/src/bin/experiment.rs
index d2f552a..7195741 100644
--- a/ebml/src/bin/experiment.rs
+++ b/ebml/src/bin/experiment.rs
@@ -1,7 +1,7 @@
use ebml::{matroska::MatroskaTag, read::EbmlReader, write::EbmlWriter};
use std::{
fs::File,
- io::{stdin, stdout, BufReader, BufWriter},
+ io::{stdout, BufReader, BufWriter},
};
fn main() -> anyhow::Result<()> {
diff --git a/ebml/src/read.rs b/ebml/src/read.rs
index 56eec51..eb1f365 100644
--- a/ebml/src/read.rs
+++ b/ebml/src/read.rs
@@ -91,14 +91,7 @@ impl EbmlReader {
let id = self.read_tag_id()?;
let size = self.read_tag_size()?;
let is_master = MatroskaTag::is_master(id)?;
- let mut collect = false;
let tag = if is_master {
- match id {
- 0x18538067 => (), // segment
- 0x1F43B675 => (), // cluster
- _ => collect = true,
- }
- // we cant collect here, so insert a placeholder
MatroskaTag::construct_master(id, Master::Start)?
} else {
let data = self.read_buf(size.some().unwrap())?;
@@ -109,11 +102,6 @@ impl EbmlReader {
// we have slightly different rules for closing tags implicitly
// this closes as many tags as needed to make the next tag a valid child
while let Some(tag @ StackTag { end: None, .. }) = self.stack.last() {
- // for p in path {
- // if *p == tag.id {
- // valid_child = true;
- // }
- // }
let valid_child = path.last() == Some(&tag.id);
if valid_child {
break;