Allow adding additional box decoders in get_boxes

Author: anayw2001

README.md

@@ -35,12 +35,12 @@ fn main() -> anyhow::Result<()> {
     let size = file.metadata()?.len();
 
     // Parse all boxes without decoding
-    let boxes = get_boxes(&mut file, size, false)?;
+    let boxes = get_boxes(&mut file, size, false, |r| r)?;
     println!("Found {} top-level boxes", boxes.len());
 
     // Parse with decoding for known box types
     let mut file = File::open("video.mp4")?;
-    let decoded_boxes = get_boxes(&mut file, size, true)?;
+    let decoded_boxes = get_boxes(&mut file, size, true, |r| r)?;
 
     // Print decoded info for ftyp box
     if let Some(ftyp) = decoded_boxes.iter().find(|b| b.typ == "ftyp") {
@@ -105,7 +105,7 @@ use std::fs::File;
 
 let mut file = File::open("video.mp4")?;
 let size = file.metadata()?.len();
-let boxes = get_boxes(&mut file, size, /*decode=*/ false)?;
+let boxes = get_boxes(&mut file, size, /*decode=*/ false, |r| r)?;
 println!("{} top-level boxes", boxes.len());
 ```
 

examples/boxes.rs

@@ -1,4 +1,5 @@
 use std::env;
+use std::fs::File;
 
 // Analyze an MP4 file and print the number of top-level boxes.
 fn main() -> anyhow::Result<()> {
@@ -7,13 +8,14 @@ fn main() -> anyhow::Result<()> {
         eprintln!("Usage: {} <file>", args[0]);
         std::process::exit(1);
     }
+    let path = &args[1];
 
-    let mut file = std::fs::File::open(&args[1])?;
+    let mut file = File::open(path)?;
     let size = file.metadata()?.len();
 
-    // Use the get_boxes function from the mp4box crate
-    let boxes = mp4box::get_boxes(&mut file, size, /*decode=*/ false)?;
-    println!("Top-level boxes: {}", boxes.len());
+    let boxes = mp4box::get_boxes(&mut file, size, /*decode=*/ false, |r| r)?;
+
+    let _json = serde_json::to_string_pretty(&boxes)?;
 
     // Example: print types of all top-level boxes
     let media_info = boxes.iter().find(|b| b.typ == "moov").and_then(|moov_box| {
@@ -38,4 +40,4 @@ fn main() -> anyhow::Result<()> {
     }
 
     Ok(())
-}
+}

examples/samples.rs

@@ -14,7 +14,7 @@ fn main() -> anyhow::Result<()> {
     let size = file.metadata()?.len();
 
     // Parse with decoding enabled to get structured data
-    let boxes = get_boxes(&mut file, size, true)?;
+    let boxes = get_boxes(&mut file, size, true, |r| r)?;
 
     println!("Analyzing sample tables in: {}", path);
     analyze_sample_tables(&boxes, 0);

src/api.rs

@@ -31,7 +31,7 @@ pub struct Box {
     pub uuid: Option<String>,
     /// Version field for FullBox types
     pub version: Option<u8>,
-    /// Flags field for FullBox types  
+    /// Flags field for FullBox types
     pub flags: Option<u32>,
     /// Box classification: "leaf", "full", "container", or "unknown"
     pub kind: String,
@@ -49,7 +49,7 @@ pub struct Box {
 ///
 /// # Parameters
 /// - `r`: A reader that implements `Read + Seek` (e.g., `File`, `Cursor<Vec<u8>>`)
-/// - `size`: The total size of the MP4 data to parse (typically file length)  
+/// - `size`: The total size of the MP4 data to parse (typically file length)
 /// - `decode`: Whether to decode known box types using the default registry
 ///
 /// # Returns
@@ -63,10 +63,15 @@ pub struct Box {
 ///
 /// let mut file = File::open("video.mp4")?;
 /// let size = file.metadata()?.len();
-/// let boxes = get_boxes(&mut file, size, true)?; // decode known boxes
+/// let boxes = get_boxes(&mut file, size, true, |r| r)?; // decode known boxes
 /// # Ok::<(), anyhow::Error>(())
 /// ```
-pub fn get_boxes<R: Read + Seek>(r: &mut R, size: u64, decode: bool) -> anyhow::Result<Vec<Box>> {
+pub fn get_boxes<R: Read + Seek>(
+    r: &mut R,
+    size: u64,
+    decode: bool,
+    additional_registrations: impl FnOnce(crate::Registry) -> crate::Registry,
+) -> anyhow::Result<Vec<Box>> {
     // let mut f = File::open(&path)?;
     // let file_len = f.metadata()?.len();
 
@@ -114,7 +119,7 @@ pub fn get_boxes<R: Read + Seek>(r: &mut R, size: u64, decode: bool) -> anyhow::
     }
 
     // build JSON tree
-    let reg = default_registry();
+    let reg = additional_registrations(default_registry());
     let json_boxes = boxes
         .iter()
         .map(|b| build_box(r, b, decode, &reg))

src/bin/mp4info.rs

@@ -72,7 +72,7 @@ fn main() -> anyhow::Result<()> {
     let mut file = std::fs::File::open(&path)?;
     let size = file.metadata()?.len();
 
-    let boxes = get_boxes(&mut file, size, /*decode=*/ true)?;
+    let boxes = get_boxes(&mut file, size, /*decode=*/ true, |r| r)?;
     let mut info = MediaInfo {
         file: path.display().to_string(),
         major_brand: None,

src/bin/mp4samples.rs

@@ -60,7 +60,7 @@ fn main() -> Result<()> {
     let size = file.metadata()?.len();
 
     // Parse with structured decoding enabled
-    let boxes = get_boxes(&mut file, size, true)?;
+    let boxes = get_boxes(&mut file, size, true, |r| r)?;
 
     if args.tables {
         print_sample_tables(&boxes, &args)?;

src/lib.rs

@@ -31,12 +31,12 @@
 //!     let size = file.metadata()?.len();
 //!     
 //!     // Parse structure only
-//!     let boxes = get_boxes(&mut file, size, false)?;
+//!     let boxes = get_boxes(&mut file, size, false, |r| r)?;
 //!     println!("Found {} top-level boxes", boxes.len());
 //!     
 //!     // Parse with decoding of known box types
 //!     let mut file = File::open("video.mp4")?;
-//!     let decoded_boxes = get_boxes(&mut file, size, true)?;
+//!     let decoded_boxes = get_boxes(&mut file, size, true, |r| r)?;
 //!     
 //!     // Print file type info
 //!     if let Some(ftyp) = decoded_boxes.iter().find(|b| b.typ == "ftyp") {

src/samples.rs

@@ -153,8 +153,13 @@ pub fn track_samples_from_reader<R: Read + Seek>(
     let file_size = reader.seek(SeekFrom::End(0))?;
     reader.seek(SeekFrom::Start(0))?;
 
-    let boxes = crate::get_boxes(&mut reader, file_size, /*decode=*/ true)
-        .context("getting boxes from reader")?;
+    let boxes = crate::get_boxes(
+        &mut reader,
+        file_size,
+        /*decode=*/ true,
+        |registry| registry,
+    )
+    .context("getting boxes from reader")?;
 
     let mut result = Vec::new();
 
@@ -270,7 +275,7 @@ pub fn track_samples_from_path(path: impl AsRef<Path>) -> anyhow::Result<Vec<Tra
 /// fn main() -> Result<(), Box<dyn std::error::Error>> {
 ///     let mut file = File::open("video.mp4")?;
 ///     let file_size = file.metadata()?.len();
-///     let boxes = get_boxes(&mut file, file_size, true)?;
+///     let boxes = get_boxes(&mut file, file_size, true, |r| r)?;
 ///
 ///     // Find moov box and extract samples from each track
 ///     for moov_box in boxes.iter().filter(|b| b.typ == "moov") {

tests/json_roundtrip.rs

@@ -43,11 +43,12 @@ fn analyze_and_serialize_to_json() {
     let path = make_minimal_mp4_file();
 
     // Parse structure (no decoders needed here)
-    let mut file = File::open(&path).expect("open temp file failed");
-    let size = file.metadata().expect("metadata failed").len();
-    let boxes = get_boxes(&mut file, size, /*decode=*/ false).expect("get_boxes failed");
+    let mut file = File::open(&path).expect("Failed to open test file");
+    let size = file.metadata().expect("Failed to get metadata").len();
 
-    // We at least expect the first box to be our ftyp.
+    let boxes = get_boxes(&mut file, size, /*decode=*/ false, |r| r).expect("get_boxes failed");
+
+    // Serialize to JSON
     assert!(!boxes.is_empty(), "no boxes returned from get_boxes");
     assert_eq!(boxes[0].typ, "ftyp");