aboutsummaryrefslogtreecommitdiff
path: root/ebml
diff options
context:
space:
mode:
Diffstat (limited to 'ebml')
-rw-r--r--ebml/Cargo.toml3
-rw-r--r--ebml/src/bin/experiment.rs3
-rw-r--r--ebml/src/lib.rs (renamed from ebml/src/mod.rs)3
-rw-r--r--ebml/src/matroska.rs6
-rw-r--r--ebml/src/read.rs3
5 files changed, 10 insertions, 8 deletions
diff --git a/ebml/Cargo.toml b/ebml/Cargo.toml
index b01d4a3..ec58cc4 100644
--- a/ebml/Cargo.toml
+++ b/ebml/Cargo.toml
@@ -5,3 +5,6 @@ edition = "2021"
[dependencies]
ebml_derive = { path = "../ebml_derive" }
+anyhow = "1.0.68"
+log = "0.4.17"
+env_logger = "0.10.0"
diff --git a/ebml/src/bin/experiment.rs b/ebml/src/bin/experiment.rs
index 7d8cede..d332b41 100644
--- a/ebml/src/bin/experiment.rs
+++ b/ebml/src/bin/experiment.rs
@@ -1,6 +1,5 @@
use std::fs::File;
-
-use jellyremuxer::format::matroska::read::EbmlReader;
+use ebml::read::EbmlReader;
fn main() {
env_logger::init_from_env("LOG");
diff --git a/ebml/src/mod.rs b/ebml/src/lib.rs
index 5da6809..116b8e2 100644
--- a/ebml/src/mod.rs
+++ b/ebml/src/lib.rs
@@ -1,4 +1,4 @@
-use crate::format::matroska::read::EbmlSize;
+use crate::read::EbmlSize;
use self::read::EbmlReader;
use anyhow::{bail, Result};
@@ -6,6 +6,7 @@ use log::debug;
pub mod matroska;
pub mod read;
+pub mod write;
#[derive(Debug, Clone)]
pub enum Master {
diff --git a/ebml/src/matroska.rs b/ebml/src/matroska.rs
index f53a1e8..802ce6a 100644
--- a/ebml/src/matroska.rs
+++ b/ebml/src/matroska.rs
@@ -1,11 +1,10 @@
-
-
+use ebml_derive::define_ebml;
define_ebml! {
global Crc32[0xbf]: Binary,
global Void[0xec]: Binary,
- Ebml[0x1a45dfa3] {
+ Ebml[0x1a45dfa3]: {
EbmlVersion[0x4286]: u64,
EbmlReadVersion[0x42f7]: u64,
EbmlMaxIdLength[0x42f2]: u64,
@@ -19,6 +18,7 @@ define_ebml! {
},
},
}
+
// #[id=0x18538067] Segment(Master),
// #[id=0x1941A469] Segment/Attachments(Master),
// #[id=0x61A7] Segment/Attachments/AttachedFile(Master),
diff --git a/ebml/src/read.rs b/ebml/src/read.rs
index 0ffb24c..9864ea5 100644
--- a/ebml/src/read.rs
+++ b/ebml/src/read.rs
@@ -2,9 +2,8 @@ use std::io::{Read, Seek};
use anyhow::{bail, Result};
use log::debug;
-use webm_iterable::matroska_spec::MatroskaSpec;
-use crate::format::matroska::{Master, MatroskaTag};
+// use crate::matroska::{Master, MatroskaTag};
trait ReadAndSeek: Read + Seek {}
impl<T: Read + Seek> ReadAndSeek for T {}