Adding Movie Extends Box and subboxes (mvex, mehd, trex).

src/mp4box/mehd.rs

@@ -0,0 +1,147 @@
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+use std::io::{Read, Seek, Write};
+use serde::{Serialize};
+
+use crate::mp4box::*;
+
+#[derive(Debug, Clone, PartialEq, Serialize)]
+pub struct MehdBox {
+    pub version: u8,
+    pub flags: u32,
+    pub fragment_duration: u64,
+}
+
+impl MehdBox {
+    pub fn get_type(&self) -> BoxType {
+        BoxType::MehdBox
+    }
+
+    pub fn get_size(&self) -> u64 {
+        let mut size = HEADER_SIZE + HEADER_EXT_SIZE;
+
+        if self.version == 1 {
+            size += 8;
+        } else {
+            assert_eq!(self.version, 0);
+            size += 4;
+        }
+        size
+    }
+}
+
+impl Default for MehdBox {
+    fn default() -> Self {
+        MehdBox {
+            version: 0,
+            flags: 0,
+            fragment_duration: 0,
+        }
+    }
+}
+
+impl Mp4Box for MehdBox {
+    fn box_type(&self) -> BoxType {
+        return self.get_type();
+    }
+
+    fn box_size(&self) -> u64 {
+        return self.get_size();
+    }
+
+    fn to_json(&self) -> Result<String> {
+        Ok(serde_json::to_string(&self).unwrap())
+    }
+
+    fn summary(&self) -> Result<String> {
+        let s = format!("fragment_duration={}", self.fragment_duration);
+        Ok(s)
+    }
+}
+
+impl<R: Read + Seek> ReadBox<&mut R> for MehdBox {
+    fn read_box(reader: &mut R, size: u64) -> Result<Self> {
+        let start = box_start(reader)?;
+
+        let (version, flags) = read_box_header_ext(reader)?;
+
+        let fragment_duration = if version == 1 {
+            reader.read_u64::<BigEndian>()?
+        } else {
+            assert_eq!(version, 0);
+            reader.read_u32::<BigEndian>()? as u64
+        };
+        skip_bytes_to(reader, start + size)?;
+
+        Ok(MehdBox {
+            version,
+            flags,
+            fragment_duration,
+        })
+    }
+}
+
+impl<W: Write> WriteBox<&mut W> for MehdBox {
+    fn write_box(&self, writer: &mut W) -> Result<u64> {
+        let size = self.box_size();
+        BoxHeader::new(self.box_type(), size).write(writer)?;
+
+        write_box_header_ext(writer, self.version, self.flags)?;
+
+        if self.version == 1 {
+            writer.write_u64::<BigEndian>(self.fragment_duration)?;
+        } else {
+            assert_eq!(self.version, 0);
+            writer.write_u32::<BigEndian>(self.fragment_duration as u32)?;
+        }
+
+        Ok(size)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::mp4box::BoxHeader;
+    use std::io::Cursor;
+
+
+    #[test]
+    fn test_mehd32() {
+        let src_box = MehdBox {
+            version: 0,
+            flags: 0,
+            fragment_duration: 32,
+        };
+        let mut buf = Vec::new();
+        src_box.write_box(&mut buf).unwrap();
+        assert_eq!(buf.len(), src_box.box_size() as usize);
+
+        let mut reader = Cursor::new(&buf);
+        let header = BoxHeader::read(&mut reader).unwrap();
+        assert_eq!(header.name, BoxType::MehdBox);
+        assert_eq!(src_box.box_size(), header.size);
+
+        let dst_box = MehdBox::read_box(&mut reader, header.size).unwrap();
+        assert_eq!(src_box, dst_box);
+    }
+
+    #[test]
+    fn test_mehd64() {
+        let src_box = MehdBox {
+            version: 0,
+            flags: 0,
+            fragment_duration: 30439936,
+        };
+        let mut buf = Vec::new();
+        src_box.write_box(&mut buf).unwrap();
+        assert_eq!(buf.len(), src_box.box_size() as usize);
+
+        let mut reader = Cursor::new(&buf);
+        let header = BoxHeader::read(&mut reader).unwrap();
+        assert_eq!(header.name, BoxType::MehdBox);
+        assert_eq!(src_box.box_size(), header.size);
+
+        let dst_box = MehdBox::read_box(&mut reader, header.size).unwrap();
+        assert_eq!(src_box, dst_box);
+    }
+}

src/mp4box/mod.rs

@@ -16,6 +16,9 @@ pub(crate) mod mdhd;
 pub(crate) mod mdia;
 pub(crate) mod minf;
 pub(crate) mod moov;
+pub(crate) mod mvex;
+pub(crate) mod mehd;
+pub(crate) mod trex;
 pub(crate) mod moof;
 pub(crate) mod mp4a;
 pub(crate) mod mvhd;
@@ -79,6 +82,9 @@ boxtype! {
     FreeBox => 0x66726565,
     MdatBox => 0x6d646174,
     MoovBox => 0x6d6f6f76,
+    MvexBox => 0x6d766578,
+    MehdBox => 0x6d656864,
+    TrexBox => 0x74726578,
     MoofBox => 0x6d6f6f66,
     TkhdBox => 0x746b6864,
     TfhdBox => 0x74666864,

src/mp4box/moov.rs

@@ -2,12 +2,15 @@ use std::io::{Read, Seek, SeekFrom, Write};
 use serde::{Serialize};
 
 use crate::mp4box::*;
-use crate::mp4box::{mvhd::MvhdBox, trak::TrakBox};
+use crate::mp4box::{mvhd::MvhdBox, mvex::MvexBox, trak::TrakBox};
 
 #[derive(Debug, Clone, PartialEq, Default, Serialize)]
 pub struct MoovBox {
     pub mvhd: MvhdBox,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mvex: Option<MvexBox>,
+
     #[serde(rename = "trak")]
     pub traks: Vec<TrakBox>,
 }
@@ -50,6 +53,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MoovBox {
         let start = box_start(reader)?;
 
         let mut mvhd = None;
+        let mut mvex = None;
         let mut traks = Vec::new();
 
         let mut current = reader.seek(SeekFrom::Current(0))?;
@@ -63,6 +67,9 @@ impl<R: Read + Seek> ReadBox<&mut R> for MoovBox {
                 BoxType::MvhdBox => {
                     mvhd = Some(MvhdBox::read_box(reader, s)?);
                 }
+                BoxType::MvexBox => {
+                    mvex = Some(MvexBox::read_box(reader, s)?);
+                }
                 BoxType::TrakBox => {
                     let trak = TrakBox::read_box(reader, s)?;
                     traks.push(trak);
@@ -88,6 +95,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MoovBox {
 
         Ok(MoovBox {
             mvhd: mvhd.unwrap(),
+            mvex,
             traks,
         })
     }

src/mp4box/mvex.rs

@@ -0,0 +1,98 @@
+use std::io::{Read, Seek, SeekFrom, Write};
+use serde::{Serialize};
+
+use crate::mp4box::*;
+use crate::mp4box::{mehd::MehdBox, trex::TrexBox};
+
+#[derive(Debug, Clone, PartialEq, Default, Serialize)]
+pub struct MvexBox {
+    pub mehd: MehdBox,
+    pub trex: TrexBox,
+}
+
+impl MvexBox {
+    pub fn get_type(&self) -> BoxType {
+        BoxType::MdiaBox
+    }
+
+    pub fn get_size(&self) -> u64 {
+        HEADER_SIZE + self.mehd.box_size() + self.trex.box_size()
+    }
+}
+
+impl Mp4Box for MvexBox {
+    fn box_type(&self) -> BoxType {
+        return self.get_type();
+    }
+
+    fn box_size(&self) -> u64 {
+        return self.get_size();
+    }
+
+    fn to_json(&self) -> Result<String> {
+        Ok(serde_json::to_string(&self).unwrap())
+    }
+
+    fn summary(&self) -> Result<String> {
+        let s = format!("");
+        Ok(s)
+    }
+}
+
+impl<R: Read + Seek> ReadBox<&mut R> for MvexBox {
+    fn read_box(reader: &mut R, size: u64) -> Result<Self> {
+        let start = box_start(reader)?;
+
+        let mut mehd = None;
+        let mut trex = None;
+
+        let mut current = reader.seek(SeekFrom::Current(0))?;
+        let end = start + size;
+        while current < end {
+            // Get box header.
+            let header = BoxHeader::read(reader)?;
+            let BoxHeader { name, size: s } = header;
+
+            match name {
+                BoxType::MehdBox => {
+                    mehd = Some(MehdBox::read_box(reader, s)?);
+                }
+                BoxType::TrexBox => {
+                    trex = Some(TrexBox::read_box(reader, s)?);
+                }
+                _ => {
+                    // XXX warn!()
+                    skip_box(reader, s)?;
+                }
+            }
+
+            current = reader.seek(SeekFrom::Current(0))?;
+        }
+
+        if mehd.is_none() {
+            return Err(Error::BoxNotFound(BoxType::MehdBox));
+        }
+        if trex.is_none() {
+            return Err(Error::BoxNotFound(BoxType::TrexBox));
+        }
+
+        skip_bytes_to(reader, start + size)?;
+
+        Ok(MvexBox {
+            mehd: mehd.unwrap(),
+            trex: trex.unwrap(),
+        })
+    }
+}
+
+impl<W: Write> WriteBox<&mut W> for MvexBox {
+    fn write_box(&self, writer: &mut W) -> Result<u64> {
+        let size = self.box_size();
+        BoxHeader::new(self.box_type(), size).write(writer)?;
+
+        self.mehd.write_box(writer)?;
+        self.trex.write_box(writer)?;
+
+        Ok(size)
+    }
+}

src/mp4box/tfhd.rs

@@ -9,6 +9,7 @@ pub struct TfhdBox {
     pub version: u8,
     pub flags: u32,
     pub track_id: u32,
+    pub base_data_offset: u64,
 }
 
 impl Default for TfhdBox {
@@ -17,6 +18,7 @@ impl Default for TfhdBox {
             version: 0,
             flags: 0,
             track_id: 0,
+            base_data_offset: 0,
         }
     }
 }
@@ -27,7 +29,7 @@ impl TfhdBox {
     }
 
     pub fn get_size(&self) -> u64 {
-        HEADER_SIZE + HEADER_EXT_SIZE + 4
+        HEADER_SIZE + HEADER_EXT_SIZE + 4 + 8
     }
 }
 
@@ -56,6 +58,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for TfhdBox {
 
         let (version, flags) = read_box_header_ext(reader)?;
         let track_id = reader.read_u32::<BigEndian>()?;
+        let base_data_offset = reader.read_u64::<BigEndian>()?;
 
         skip_bytes_to(reader, start + size)?;
 
@@ -63,6 +66,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for TfhdBox {
             version,
             flags,
             track_id,
+            base_data_offset,
         })
     }
 }
@@ -74,6 +78,7 @@ impl<W: Write> WriteBox<&mut W> for TfhdBox {
 
         write_box_header_ext(writer, self.version, self.flags)?;
         writer.write_u32::<BigEndian>(self.track_id)?;
+        writer.write_u64::<BigEndian>(self.base_data_offset)?;
 
         Ok(size)
     }
@@ -91,6 +96,7 @@ mod tests {
             version: 0,
             flags: 0,
             track_id: 1,
+            base_data_offset: 0,
         };
         let mut buf = Vec::new();
         src_box.write_box(&mut buf).unwrap();

src/mp4box/trex.rs

@@ -0,0 +1,122 @@
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+use std::io::{Read, Seek, Write};
+use serde::{Serialize};
+
+use crate::mp4box::*;
+
+#[derive(Debug, Clone, PartialEq, Default, Serialize)]
+pub struct TrexBox {
+    pub version: u8,
+    pub flags: u32,
+    pub track_id: u32,
+    pub default_sample_description_index: u32, 
+    pub default_sample_duration: u32, 
+    pub default_sample_size: u32, 
+    pub default_sample_flags: u32, 
+}
+
+impl TrexBox {
+    pub fn get_type(&self) -> BoxType {
+        BoxType::TrexBox
+    }
+
+    pub fn get_size(&self) -> u64 {
+        HEADER_SIZE + HEADER_EXT_SIZE + 4 + 20
+    }
+}
+
+impl Mp4Box for TrexBox {
+    fn box_type(&self) -> BoxType {
+        return self.get_type();
+    }
+
+    fn box_size(&self) -> u64 {
+        return self.get_size();
+    }
+
+    fn to_json(&self) -> Result<String> {
+        Ok(serde_json::to_string(&self).unwrap())
+    }
+
+    fn summary(&self) -> Result<String> {
+        let s = format!("track_id={} default_sample_duration={}",
+            self.track_id, self.default_sample_duration);
+        Ok(s)
+    }
+}
+
+impl<R: Read + Seek> ReadBox<&mut R> for TrexBox {
+    fn read_box(reader: &mut R, size: u64) -> Result<Self> {
+        let start = box_start(reader)?;
+
+        let (version, flags) = read_box_header_ext(reader)?;
+
+        reader.read_u32::<BigEndian>()?; // pre-defined
+        let track_id = reader.read_u32::<BigEndian>()?;
+        let default_sample_description_index = reader.read_u32::<BigEndian>()?;
+        let default_sample_duration = reader.read_u32::<BigEndian>()?;
+        let default_sample_size = reader.read_u32::<BigEndian>()?;
+        let default_sample_flags = reader.read_u32::<BigEndian>()?;
+
+        skip_bytes_to(reader, start + size)?;
+
+        Ok(TrexBox {
+            version,
+            flags,
+            track_id,
+            default_sample_description_index,
+            default_sample_duration,
+            default_sample_size,
+            default_sample_flags,
+        })
+    }
+}
+
+impl<W: Write> WriteBox<&mut W> for TrexBox {
+    fn write_box(&self, writer: &mut W) -> Result<u64> {
+        let size = self.box_size();
+        BoxHeader::new(self.box_type(), size).write(writer)?;
+
+        write_box_header_ext(writer, self.version, self.flags)?;
+
+        writer.write_u32::<BigEndian>(0)?; // pre-defined
+        writer.write_u32::<BigEndian>(self.track_id)?;
+        writer.write_u32::<BigEndian>(self.default_sample_description_index)?;
+        writer.write_u32::<BigEndian>(self.default_sample_duration)?;
+        writer.write_u32::<BigEndian>(self.default_sample_size)?;
+        writer.write_u32::<BigEndian>(self.default_sample_flags)?;
+
+        Ok(size)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::mp4box::BoxHeader;
+    use std::io::Cursor;
+
+    #[test]
+    fn test_trex() {
+        let src_box = TrexBox {
+            version: 0,
+            flags: 0,
+            track_id: 1,
+            default_sample_description_index: 1,
+            default_sample_duration: 1000,
+            default_sample_size: 0,
+            default_sample_flags: 65536,
+        };
+        let mut buf = Vec::new();
+        src_box.write_box(&mut buf).unwrap();
+        assert_eq!(buf.len(), src_box.box_size() as usize);
+
+        let mut reader = Cursor::new(&buf);
+        let header = BoxHeader::read(&mut reader).unwrap();
+        assert_eq!(header.name, BoxType::TrexBox);
+        assert_eq!(src_box.box_size(), header.size);
+
+        let dst_box = TrexBox::read_box(&mut reader, header.size).unwrap();
+        assert_eq!(src_box, dst_box);
+    }
+}