add CodecDelay and SeekPreRoll (+ fix TrackUID collision)

1 files changed, 5 insertions, 2 deletions

diff --git a/remuxer/src/lib.rs b/remuxer/src/lib.rs
index 3ea16e2..b46369e 100644
--- a/remuxer/src/lib.rs
+++ b/remuxer/src/lib.rs
@@ -43,15 +43,18 @@ pub fn ebml_segment_info(title: String, duration: f64) -> MatroskaTag {
 
 pub fn ebml_track_entry(
     number: u64,
+    uid: u64,
     track: &SourceTrack,
     codec_private: Option<Vec<u8>>,
 ) -> MatroskaTag {
     let mut els = vec![
         MatroskaTag::TrackNumber(number),
-        MatroskaTag::TrackUID(number),
+        MatroskaTag::TrackUID(uid),
         MatroskaTag::FlagLacing(0),
         MatroskaTag::Language(track.language.clone()),
         MatroskaTag::CodecID(track.codec.clone()),
+        MatroskaTag::CodecDelay(track.codec_delay.clone()),
+        MatroskaTag::SeekPreRoll(track.seek_pre_roll.clone()),
     ];
     if let Some(d) = &track.default_duration {
         els.push(MatroskaTag::DefaultDuration(*d));
@@ -72,7 +75,7 @@ pub fn ebml_track_entry(
             ];
             props.push(MatroskaTag::DisplayWidth(display_width.unwrap_or(width)));
             props.push(MatroskaTag::DisplayHeight(display_height.unwrap_or(height)));
-            props.push(MatroskaTag::DisplayUnit(display_unit.unwrap_or(0)));
+            props.push(MatroskaTag::DisplayUnit(display_unit));
             if let Some(fps) = fps {
                 props.push(MatroskaTag::FrameRate(fps))
             }