fix: av1, h264, h265, mp4 and opus boxes

Author: lennartkloock

crates/av1/src/boxes.rs

@@ -3,7 +3,7 @@
 //! <https://aomediacodec.github.io/av1-isobmff>
 
 use isobmff::boxes::VisualSampleEntry;
-use isobmff::{BoxHeader, IsoBox, UnknownBox};
+use isobmff::{IsoBox, UnknownBox};
 
 use crate::AV1CodecConfigurationRecord;
 
@@ -13,9 +13,6 @@ use crate::AV1CodecConfigurationRecord;
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"av01")]
 pub struct AV1SampleEntry<'a> {
-    /// Header of the box
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The visual sample entry fields that this box inherits.
     pub sample_entry: VisualSampleEntry,
     /// The AV1 codec configuration box contained in this box.
@@ -32,9 +29,6 @@ pub struct AV1SampleEntry<'a> {
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"av1C")]
 pub struct AV1CodecConfigurationBox<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The AV1 codec configuration record.
     pub av1_config: AV1CodecConfigurationRecord<'a>,
 }

crates/h264/src/boxes.rs

@@ -3,7 +3,7 @@
 //! ISO/IEC 14496-15 - 5.4
 
 use isobmff::boxes::{MPEG4ExtensionDescriptorsBox, VisualSampleEntry};
-use isobmff::{BoxHeader, IsoBox, UnknownBox};
+use isobmff::{IsoBox, UnknownBox};
 
 use crate::AVCDecoderConfigurationRecord;
 
@@ -13,9 +13,6 @@ use crate::AVCDecoderConfigurationRecord;
 #[derive(IsoBox, Debug)]
 #[iso_box(box_type = b"avcC")]
 pub struct AVCConfigurationBox<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The AVC decoder configuration record.
     pub avc_config: AVCDecoderConfigurationRecord<'a>,
 }
@@ -28,9 +25,6 @@ pub struct AVCConfigurationBox<'a> {
 #[derive(IsoBox, Debug)]
 #[iso_box(box_type = b"avc1")]
 pub struct AVCSampleEntry1<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The visual sample entry fields that this box inherits.
     pub visual_sample_entry: VisualSampleEntry,
     /// The AVC configuration box contained in this box.
@@ -50,9 +44,6 @@ pub struct AVCSampleEntry1<'a> {
 #[derive(IsoBox, Debug)]
 #[iso_box(box_type = b"avc2")]
 pub struct AVCSampleEntry2<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The visual sample entry fields that this box inherits.
     pub visual_sample_entry: VisualSampleEntry,
     /// The AVC configuration box contained in this box.
@@ -72,9 +63,6 @@ pub struct AVCSampleEntry2<'a> {
 #[derive(IsoBox, Debug)]
 #[iso_box(box_type = b"avc3")]
 pub struct AVCSampleEntry3<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The visual sample entry fields that this box inherits.
     pub visual_sample_entry: VisualSampleEntry,
     /// The AVC configuration box contained in this box.
@@ -94,9 +82,6 @@ pub struct AVCSampleEntry3<'a> {
 #[derive(IsoBox, Debug)]
 #[iso_box(box_type = b"avc4")]
 pub struct AVCSampleEntry4<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The visual sample entry fields that this box inherits.
     pub visual_sample_entry: VisualSampleEntry,
     /// The AVC configuration box contained in this box.
@@ -116,9 +101,6 @@ pub struct AVCSampleEntry4<'a> {
 #[derive(IsoBox, Debug)]
 #[iso_box(box_type = b"avcp")]
 pub struct AVCParameterSampleEntry<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The visual sample entry fields that this box inherits.
     pub visual_sample_entry: VisualSampleEntry,
     /// The AVC configuration box contained in this box.

crates/h265/src/boxes.rs

@@ -3,7 +3,7 @@
 //! ISO/IEC 14496-15 - 8.4
 
 use isobmff::boxes::{MPEG4ExtensionDescriptorsBox, VisualSampleEntry};
-use isobmff::{BoxHeader, IsoBox, UnknownBox};
+use isobmff::{IsoBox, UnknownBox};
 
 use crate::HEVCDecoderConfigurationRecord;
 
@@ -13,9 +13,6 @@ use crate::HEVCDecoderConfigurationRecord;
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"hvcC")]
 pub struct HEVCConfigurationBox<'a> {
-    /// The box header.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The HEVC decoder configuration record contained in this box.
     pub hevc_config: HEVCDecoderConfigurationRecord<'a>,
 }
@@ -26,9 +23,6 @@ pub struct HEVCConfigurationBox<'a> {
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"hvc1")]
 pub struct HEVCSampleEntryHvc1<'a> {
-    /// The box header.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The visual sample entry fields that this box inherits.
     pub sample_entry: VisualSampleEntry,
     /// The HEVC configuration box contained in this box.
@@ -48,9 +42,6 @@ pub struct HEVCSampleEntryHvc1<'a> {
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"hev1")]
 pub struct HEVCSampleEntryHev1<'a> {
-    /// The box header.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The visual sample entry fields that this box inherits.
     pub sample_entry: VisualSampleEntry,
     /// The HEVC configuration box contained in this box.

crates/isobmff/src/boxes/other.rs

@@ -10,7 +10,6 @@ use crate::IsoBox;
 #[derive(IsoBox, Debug)]
 #[iso_box(box_type = b"m4ds", crate_path = crate)]
 pub struct MPEG4ExtensionDescriptorsBox<'a> {
-    /// Header of the box.
     /// A descriptor that should be placed in the `ElementaryStreamDescriptor` when this
     /// stream is used in an MPEG-4 systems context. This does not include `SLConfigDescriptor` or
     /// `DecoderConfigDescriptor`, but includes the other descriptors in order to be placed after

crates/mp4/src/boxes.rs

@@ -3,7 +3,7 @@
 //! ISO/IEC 14496-14 - 6
 
 use isobmff::boxes::{AudioSampleEntry, SampleEntry, VisualSampleEntry};
-use isobmff::{BoxHeader, FullBoxHeader, IsoBox};
+use isobmff::{FullBoxHeader, IsoBox};
 use scuffle_bytes_util::BytesCow;
 
 /// Object Descriptor Box
@@ -12,8 +12,7 @@ use scuffle_bytes_util::BytesCow;
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"iods")]
 pub struct ObjectDescriptorBox<'a> {
-    /// Header of the box
-    #[iso_box(header)]
+    /// The full header of the box
     pub header: FullBoxHeader,
     /// The object descriptor contained in this box.
     ///
@@ -29,9 +28,6 @@ pub struct ObjectDescriptorBox<'a> {
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"mp4v")]
 pub struct MP4VisualSampleEntry<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The visual sample entry fields that this box inherits.
     pub sample_entry: VisualSampleEntry,
     /// The ES Descriptor for this stream.
@@ -45,9 +41,6 @@ pub struct MP4VisualSampleEntry<'a> {
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"mp4a")]
 pub struct MP4AudioSampleEntry<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The audio sample entry fields that this box inherits.
     pub sample_entry: AudioSampleEntry,
     /// The ES Descriptor for this stream.
@@ -61,9 +54,6 @@ pub struct MP4AudioSampleEntry<'a> {
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"mp4s")]
 pub struct MpegSampleEntry<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The sample entry fields that this box inherits.
     pub sample_entry: SampleEntry,
     /// The ES Descriptor for this stream.
@@ -77,9 +67,6 @@ pub struct MpegSampleEntry<'a> {
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"m4ae")]
 pub struct MP4AudioEnhancementSampleEntry<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The audio sample entry fields that this box inherits.
     pub sample_entry: AudioSampleEntry,
     /// The ES Descriptor for this stream.
@@ -93,8 +80,7 @@ pub struct MP4AudioEnhancementSampleEntry<'a> {
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"esds")]
 pub struct ESDBox<'a> {
-    /// Header of the box.
-    #[iso_box(header)]
+    /// The full header of the box
     pub header: FullBoxHeader,
     /// The ES Descriptor for this stream.
     ///

crates/opus/src/boxes.rs

@@ -13,9 +13,6 @@ use scuffle_bytes_util::zero_copy::{Deserialize, DeserializeSeed, Serialize};
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"Opus")]
 pub struct OpusSampleEntry<'a> {
-    /// The header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// The audio sample entry fields that this box inherits.
     pub sample_entry: AudioSampleEntry,
     /// Contains initializing information for the decoder.
@@ -32,9 +29,6 @@ pub struct OpusSampleEntry<'a> {
 #[derive(Debug, IsoBox)]
 #[iso_box(box_type = b"dOps", skip_impl(deserialize_seed, serialize))]
 pub struct OpusSpecificBox<'a> {
-    /// The header of the box.
-    #[iso_box(header)]
-    pub header: BoxHeader,
     /// Shall be set to 0.
     pub version: u8,
     /// Shall be set to the same value as the *Output Channel Count* field in the
@@ -62,7 +56,7 @@ pub struct OpusSpecificBox<'a> {
 // That's why we have to implement the traits manually here.
 
 impl<'a> DeserializeSeed<'a, BoxHeader> for OpusSpecificBox<'a> {
-    fn deserialize_seed<R>(mut reader: R, seed: BoxHeader) -> std::io::Result<Self>
+    fn deserialize_seed<R>(mut reader: R, _seed: BoxHeader) -> std::io::Result<Self>
     where
         R: scuffle_bytes_util::zero_copy::ZeroCopyReader<'a>,
     {
@@ -86,7 +80,6 @@ impl<'a> DeserializeSeed<'a, BoxHeader> for OpusSpecificBox<'a> {
         };
 
         Ok(Self {
-            header: seed,
             version,
             output_channel_count,
             pre_skip,
@@ -103,7 +96,8 @@ impl Serialize for OpusSpecificBox<'_> {
     where
         W: std::io::Write,
     {
-        self.header.serialize(&mut writer)?;
+        self.serialize_box_header(&mut writer)?;
+
         self.version.serialize(&mut writer)?;
         self.output_channel_count.serialize(&mut writer)?;
         self.pre_skip.serialize(&mut writer)?;