Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions src/moof/traf/tfhd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ pub struct Tfhd {
pub default_sample_duration: Option<u32>,
pub default_sample_size: Option<u32>,
pub default_sample_flags: Option<u32>,
pub duration_is_empty: bool,
pub default_base_is_moof: bool,
}

impl AtomExt for Tfhd {
Expand Down Expand Up @@ -65,6 +67,8 @@ impl AtomExt for Tfhd {
default_sample_duration,
default_sample_size,
default_sample_flags,
duration_is_empty: ext.duration_is_empty,
default_base_is_moof: ext.default_base_is_moof,
})
}

Expand All @@ -75,6 +79,8 @@ impl AtomExt for Tfhd {
default_sample_duration: self.default_sample_duration.is_some(),
default_sample_size: self.default_sample_size.is_some(),
default_sample_flags: self.default_sample_flags.is_some(),
duration_is_empty: self.duration_is_empty,
default_base_is_moof: self.default_base_is_moof,
..Default::default()
};

Expand Down Expand Up @@ -102,6 +108,8 @@ mod tests {
default_sample_duration: None,
default_sample_size: None,
default_sample_flags: None,
duration_is_empty: false,
default_base_is_moof: false,
};
let mut buf = Vec::new();
expected.encode(&mut buf).unwrap();
Expand All @@ -120,6 +128,41 @@ mod tests {
default_sample_duration: Some(512),
default_sample_size: None,
default_sample_flags: Some(0x1010000),
duration_is_empty: false,
default_base_is_moof: false,
};
let mut buf = Vec::new();
expected.encode(&mut buf).unwrap();

let mut buf = buf.as_ref();
let decoded = Tfhd::decode(&mut buf).unwrap();
assert_eq!(decoded, expected);
}

#[test]
fn test_tfhd_duration_is_empty() {
let expected = Tfhd {
track_id: 1,
duration_is_empty: true,
..Default::default()
};
let mut buf = Vec::new();
expected.encode(&mut buf).unwrap();

let mut buf = buf.as_ref();
let decoded = Tfhd::decode(&mut buf).unwrap();
assert_eq!(decoded, expected);
}

#[test]
fn test_tfhd_default_base_is_moof() {
let expected = Tfhd {
track_id: 1,
default_base_is_moof: true,
default_sample_duration: Some(512),
default_sample_size: Some(0),
default_sample_flags: Some(0x1010000),
..Default::default()
};
let mut buf = Vec::new();
expected.encode(&mut buf).unwrap();
Expand Down
4 changes: 3 additions & 1 deletion src/test/av1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@ fn av1() {
sample_description_index: Some(1),
default_sample_duration: Some(1000),
default_sample_size: Some(252),
default_sample_flags: Some(16842752)
default_sample_flags: Some(16842752),
duration_is_empty: false,
default_base_is_moof: true,
},
tfdt: Some(Tfdt {
base_media_decode_time: 0
Expand Down
2 changes: 2 additions & 0 deletions src/test/bbb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ fn bbb() {
default_sample_duration: 1000.into(),
default_sample_flags: 0x1010000.into(),
default_sample_size: 215.into(),
default_base_is_moof: true,
..Default::default()
},
tfdt: Some(Tfdt {
Expand Down Expand Up @@ -287,6 +288,7 @@ fn bbb() {
default_sample_duration: 1024.into(),
default_sample_flags: 0x2000000.into(),
default_sample_size: 9.into(),
default_base_is_moof: true,
..Default::default()
},
tfdt: Some(Tfdt {
Expand Down
1 change: 1 addition & 0 deletions src/test/esds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ fn esds() {
default_sample_duration: 512.into(),
default_sample_flags: 0x1010000.into(),
default_sample_size: 3377.into(),
default_base_is_moof: true,
..Default::default()
},
tfdt: Some(Tfdt {
Expand Down
2 changes: 2 additions & 0 deletions src/test/h264.rs
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ fn avc_encrypted_segment() {
default_sample_duration: None,
default_sample_size: None,
default_sample_flags: None,
duration_is_empty: false,
default_base_is_moof: true,
},
tfdt: Some(Tfdt {
base_media_decode_time: 342202323002237
Expand Down
Loading