Add fixes for hvc1

src/mp4box/hev1.rs

@@ -101,31 +101,38 @@ impl<R: Read + Seek> ReadBox<&mut R> for Hev1Box {
         let depth = reader.read_u16::<BigEndian>()?;
         reader.read_i16::<BigEndian>()?; // pre-defined
 
-        let header = BoxHeader::read(reader)?;
-        let BoxHeader { name, size: s } = header;
-        if s > size {
-            return Err(Error::InvalidData(
-                "hev1 box contains a box with a larger size than it",
-            ));
-        }
-        if name == BoxType::HvcCBox {
-            let hvcc = HvcCBox::read_box(reader, s)?;
-
-            skip_bytes_to(reader, start + size)?;
-
-            Ok(Hev1Box {
-                data_reference_index,
-                width,
-                height,
-                horizresolution,
-                vertresolution,
-                frame_count,
-                depth,
-                hvcc,
-            })
-        } else {
-            Err(Error::InvalidData("hvcc not found"))
+        let mut hvcc = None;
+
+        while reader.stream_position()? < start + size {
+            let header = BoxHeader::read(reader)?;
+            let BoxHeader { name, size: s } = header;
+            if s > size {
+                return Err(Error::InvalidData(
+                    "hev1 box contains a box with a larger size than it",
+                ));
+            }
+            if name == BoxType::HvcCBox {
+                hvcc = Some(HvcCBox::read_box(reader, s)?);
+            } else {
+                skip_box(reader, s)?;
+            }
         }
+        let Some(hvcc) = hvcc else {
+            return Err(Error::InvalidData("hvcc not found"));
+        };
+
+        skip_bytes_to(reader, start + size)?;
+
+        Ok(Hev1Box {
+            data_reference_index,
+            width,
+            height,
+            horizresolution,
+            vertresolution,
+            frame_count,
+            depth,
+            hvcc,
+        })
     }
 }
 
@@ -269,6 +276,12 @@ pub struct HvcCArray {
     pub nalus: Vec<HvcCArrayNalu>,
 }
 
+impl HvcCArray {
+    pub fn is_parameter_set(&self) -> bool {
+        self.nal_unit_type == VPS || self.nal_unit_type == SPS || self.nal_unit_type == PPS
+    }
+}
+
 impl<R: Read + Seek> ReadBox<&mut R> for HvcCBox {
     fn read_box(reader: &mut R, _size: u64) -> Result<Self> {
         let configuration_version = reader.read_u8()?;

src/mp4box/hvc1.rs

@@ -121,6 +121,12 @@ impl<R: Read + Seek> ReadBox<&mut R> for Hvc1Box {
             return Err(Error::InvalidData("hvcc not found"));
         };
 
+        for arr in &hvcc.arrays {
+            if arr.is_parameter_set() && !arr.completeness {
+                return Err(Error::InvalidData("hvcc parameter set completeness must be 1 for hvc1 box"));
+            }
+        }
+
         skip_bytes_to(reader, start + size)?;
 
         Ok(Hvc1Box {
@@ -159,6 +165,12 @@ impl<W: Write> WriteBox<&mut W> for Hvc1Box {
         writer.write_u16::<BigEndian>(self.depth)?;
         writer.write_i16::<BigEndian>(-1)?; // pre-defined
 
+        for arr in &self.hvcc.arrays {
+            if arr.is_parameter_set() && !arr.completeness {
+                return Err(Error::InvalidData("hvcc parameter set completeness must be 1 for hvc1 box"));
+            }
+        }
+
         self.hvcc.write_box(writer)?;
 
         Ok(size)
@@ -168,11 +180,19 @@ impl<W: Write> WriteBox<&mut W> for Hvc1Box {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::mp4box::BoxHeader;
+    use crate::{hev1::{HvcCArray, HvcCArrayNalu}, mp4box::BoxHeader};
     use std::io::Cursor;
 
     #[test]
     fn test_hvc1() {
+        let hvcc_array = HvcCArray {
+            completeness: true,
+            nal_unit_type: 34,
+            nalus: vec![HvcCArrayNalu {
+                size: 8,
+                data: vec![68, 1, 193, 114, 67, 141, 98, 36],
+            }],
+        };
         let src_box = Hvc1Box {
             data_reference_index: 1,
             width: 320,
@@ -183,6 +203,7 @@ mod tests {
             depth: 24,
             hvcc: HvcCBox {
                 configuration_version: 1,
+                arrays: vec![hvcc_array],
                 ..Default::default()
             },
         };

src/mp4box/stsd.rs

@@ -41,6 +41,8 @@ impl StsdBox {
             size += avc1.box_size();
         } else if let Some(ref hev1) = self.hev1 {
             size += hev1.box_size();
+        } else if let Some(ref hvc1) = self.hvc1 {
+            size += hvc1.box_size();
         } else if let Some(ref vp09) = self.vp09 {
             size += vp09.box_size();
         } else if let Some(ref mp4a) = self.mp4a {
@@ -145,6 +147,8 @@ impl<W: Write> WriteBox<&mut W> for StsdBox {
             avc1.write_box(writer)?;
         } else if let Some(ref hev1) = self.hev1 {
             hev1.write_box(writer)?;
+        } else if let Some(ref hvc1) = self.hvc1 {
+            hvc1.write_box(writer)?;
         } else if let Some(ref vp09) = self.vp09 {
             vp09.write_box(writer)?;
         } else if let Some(ref mp4a) = self.mp4a {