implement ainf box.

src/any.rs

@@ -260,6 +260,7 @@ any! {
             Year,
     Moov,
         Mvhd,
+        Ainf,
         Udta,
             Cprt,
             Kind,

src/moov/ainf.rs

@@ -0,0 +1,88 @@
+use crate::*;
+
+ext! {
+    name: Ainf,
+    versions: [0],
+    flags: {
+        hidden = 0,
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct Ainf {
+    pub hidden: bool,
+    // TODO: this could be parsed further if DECE ever becomes important again
+    pub profile_version: u32,
+    pub apid: String,
+}
+
+impl AtomExt for Ainf {
+    const KIND_EXT: FourCC = FourCC::new(b"ainf");
+
+    type Ext = AinfExt;
+
+    fn decode_body_ext<B: Buf>(buf: &mut B, ext: AinfExt) -> Result<Self> {
+        let profile_version = u32::decode(buf)?;
+        let apid = String::decode(buf)?;
+        let remaining = buf.remaining();
+        if remaining != 0 {
+            tracing::warn!("Found additional data in ainf box, which could be additional private boxes, and that data is being ignored.");
+            buf.advance(remaining);
+        }
+        Ok(Ainf {
+            hidden: ext.hidden,
+            profile_version,
+            apid,
+        })
+    }
+
+    fn encode_body_ext<B: BufMut>(&self, buf: &mut B) -> Result<AinfExt> {
+        let ext = AinfExt {
+            hidden: self.hidden,
+            version: AinfVersion::V0,
+        };
+        self.profile_version.encode(buf)?;
+        self.apid.as_str().encode(buf)?;
+        Ok(ext)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const ENCODED_AINF: &[u8] = &[
+        0x00, 0x00, 0x00, 0x38, 0x61, 0x69, 0x6e, 0x66, 0x00, 0x00, 0x00, 0x00, 0x68, 0x31, 0x30,
+        0x37, 0x75, 0x72, 0x6e, 0x3a, 0x64, 0x65, 0x63, 0x65, 0x3a, 0x61, 0x70, 0x69, 0x64, 0x3a,
+        0x6f, 0x72, 0x67, 0x3a, 0x64, 0x65, 0x63, 0x65, 0x63, 0x76, 0x70, 0x3a, 0x64, 0x65, 0x76,
+        0x69, 0x63, 0x65, 0x30, 0x30, 0x32, 0x2d, 0x34, 0x76, 0x37, 0x00,
+    ];
+
+    #[test]
+    fn test_ainf_decode() {
+        let buf: &mut std::io::Cursor<&&[u8]> = &mut std::io::Cursor::new(&ENCODED_AINF);
+        let ainf = Ainf::decode(buf).expect("failed to decode ainf");
+        assert_eq!(
+            ainf,
+            Ainf {
+                hidden: false,
+                profile_version: 1748054071,
+                apid: "urn:dece:apid:org:dececvp:device002-4v7".into(),
+            }
+        );
+    }
+
+    #[test]
+    fn test_ainf_encode() {
+        let ainf = Ainf {
+            hidden: false,
+            profile_version: 1748054071,
+            apid: "urn:dece:apid:org:dececvp:device002-4v7".into(),
+        };
+
+        let mut buf = Vec::new();
+        ainf.encode(&mut buf).unwrap();
+        assert_eq!(buf, ENCODED_AINF);
+    }
+}

src/moov/mod.rs

@@ -1,8 +1,10 @@
+mod ainf;
 mod mvex;
 mod mvhd;
 mod trak;
 mod udta;
 
+pub use ainf::*;
 pub use mvex::*;
 pub use mvhd::*;
 pub use trak::*;
@@ -18,14 +20,15 @@ pub struct Moov {
     pub mvex: Option<Mvex>,
     pub trak: Vec<Trak>,
     pub udta: Option<Udta>,
+    pub ainf: Option<Ainf>,
 }
 
 impl Atom for Moov {
     const KIND: FourCC = FourCC::new(b"moov");
 
     nested! {
         required: [ Mvhd ],
-        optional: [ Meta, Mvex, Udta ],
+        optional: [ Ainf, Meta, Mvex, Udta ],
         multiple: [ Trak ],
     }
 }
@@ -231,7 +234,7 @@ mod test {
                     senc: None,
                     udta: None
                 }],
-                udta: None,
+                ..Default::default()
             }
         )
     }

src/test/av1.rs

@@ -45,7 +45,6 @@ fn av1() {
                 },
                 next_track_id: 2
             },
-            meta: None,
             mvex: Some(Mvex {
                 mehd: None,
                 trex: vec![Trex {
@@ -189,7 +188,8 @@ fn av1() {
                     .into(),],
                 }),
                 ..Default::default()
-            })
+            }),
+            ..Default::default()
         }
     );
 

src/test/flac.rs

@@ -41,7 +41,6 @@ fn flac() {
                 },
                 next_track_id: 2
             },
-            meta: None,
             mvex: Some(Mvex {
                 mehd: None,
                 trex: vec![Trex {
@@ -157,7 +156,7 @@ fn flac() {
                 senc: None,
                 udta: None
             }],
-            udta: None
+            ..Default::default()
         }
     );
 

src/test/h264.rs

@@ -40,7 +40,6 @@ fn avcc_ext() {
             },
             next_track_id: 2,
         },
-        meta: None,
         mvex: Some(Mvex {
             mehd: None,
             trex: vec![
@@ -288,6 +287,7 @@ fn avcc_ext() {
             },
         ],
         udta: Some(Udta::default()),
+        ..Default::default()
     };
 
     assert_eq!(moov, expected, "different decoded result");

src/test/hevc.rs

@@ -40,7 +40,6 @@ fn hevc() {
                 },
                 next_track_id: 2
             },
-            meta: None,
             mvex: Some(Mvex {
                 mehd: None,
                 trex: vec![Trex {
@@ -406,7 +405,8 @@ fn hevc() {
                     .into(),],
                 }),
                 ..Default::default()
-            })
+            }),
+            ..Default::default()
         }
     );
 

src/test/uncompressed.rs

@@ -44,8 +44,6 @@ fn uncompressed() {
                 },
                 next_track_id: 2
             },
-            meta: None,
-            mvex: None,
             trak: [Trak {
                 tkhd: Tkhd {
                     creation_time: 3827291266,
@@ -239,7 +237,8 @@ fn uncompressed() {
                     .into(),],
                 }),
                 ..Default::default()
-            })
+            },),
+            ..Default::default()
         }
     );
 

src/test/vp9.rs

@@ -179,7 +179,7 @@ fn vp9() {
                 senc: None,
                 udta: None,
             }],
-            udta: None
+            ..Default::default()
         }
     );