core: add dts to packet for video

Author: sscobici

symphonia-core/src/formats/mod.rs

@@ -481,11 +481,16 @@ fn matches_track_type(track: &Track, track_type: TrackType) -> bool {
 pub struct Packet {
     /// The track ID.
     track_id: u32,
-    /// The presentation timestamp of the packet. When gapless support is enabled, this timestamp is relative to
-    /// the end of the encoder delay.
+    /// The presentation timestamp (PTS) of the packet. For audio packets, when gapless support is enabled,
+    /// this timestamp is relative to the end of the encoder delay.
     ///
     /// This timestamp is in `TimeBase` units.
     pub pts: u64,
+    /// The decoding timestamp (DTS) of the packet. Primarily used for video packets and is typically different
+    /// from the PTS. Can be negative. For audio packets, the DTS is always equal to the PTS
+    ///
+    /// This timestamp is in `TimeBase` units.
+    pub dts: i64,
     /// The duration of the packet. When gapless support is enabled, the duration does not include
     /// the encoder delay or padding.
     ///
@@ -504,12 +509,31 @@ pub struct Packet {
 impl Packet {
     /// Create a new `Packet` from a slice.
     pub fn new_from_slice(track_id: u32, pts: u64, dur: u64, buf: &[u8]) -> Self {
-        Packet { track_id, pts, dur, trim_start: 0, trim_end: 0, data: Box::from(buf) }
+        Packet {
+            track_id,
+            pts,
+            dts: pts as i64,
+            dur,
+            trim_start: 0,
+            trim_end: 0,
+            data: Box::from(buf),
+        }
     }
 
     /// Create a new `Packet` from a boxed slice.
     pub fn new_from_boxed_slice(track_id: u32, pts: u64, dur: u64, data: Box<[u8]>) -> Self {
-        Packet { track_id, pts, dur, trim_start: 0, trim_end: 0, data }
+        Packet { track_id, pts, dts: pts as i64, dur, trim_start: 0, trim_end: 0, data }
+    }
+
+    /// Create a new `Packet` from a boxed slice.
+    pub fn new_from_boxed_slice_v(
+        track_id: u32,
+        pts: u64,
+        dts: i64,
+        dur: u64,
+        data: Box<[u8]>,
+    ) -> Self {
+        Packet { track_id, pts, dts, dur, trim_start: 0, trim_end: 0, data }
     }
 
     /// Create a new `Packet` with trimming information from a slice.
@@ -521,7 +545,7 @@ impl Packet {
         trim_end: u32,
         buf: &[u8],
     ) -> Self {
-        Packet { track_id, pts, dur, trim_start, trim_end, data: Box::from(buf) }
+        Packet { track_id, pts, dts: pts as i64, dur, trim_start, trim_end, data: Box::from(buf) }
     }
 
     /// Create a new `Packet` with trimming information from a boxed slice.
@@ -533,22 +557,30 @@ impl Packet {
         trim_end: u32,
         data: Box<[u8]>,
     ) -> Self {
-        Packet { track_id, pts, dur, trim_start, trim_end, data }
+        Packet { track_id, pts, dts: pts as i64, dur, trim_start, trim_end, data }
     }
 
     /// The track identifier of the track this packet belongs to.
     pub fn track_id(&self) -> u32 {
         self.track_id
     }
 
-    /// Get the presentation timestamp of the packet in `TimeBase` units.
+    /// Get the presentation timestamp (PTS) of the packet in `TimeBase` units.
     ///
-    /// If gapless support is enabled, then this timestamp is relative to the end of the encoder
-    /// delay.
+    /// For audio packets, when gapless support is enabled,
+    /// this timestamp is relative to the end of the encoder delay.
     pub fn pts(&self) -> u64 {
         self.pts
     }
 
+    /// Get the decoding timestamp (DTS) of the packet in `TimeBase` units.
+    ///
+    /// Primarily used for video packets and is typically different
+    /// from the PTS. Can be negative. For audio packets, the DTS is always equal to the PTS
+    pub fn dts(&self) -> i64 {
+        self.dts
+    }
+
     /// Get the duration of the packet in `TimeBase` units.
     ///
     /// If gapless support is enabled, then this is the duration after the encoder delay and padding
@@ -723,6 +755,7 @@ pub mod util {
         packet.trim_start = if packet.pts < u64::from(delay) {
             let trim = (u64::from(delay) - packet.pts).min(packet.dur);
             packet.pts = 0;
+            packet.dts = 0;
             packet.dur -= trim;
             trim as u32
         }

symphonia-format-ogg/src/logical.rs

@@ -199,6 +199,7 @@ impl LogicalStream {
             for packet in self.packets.iter_mut().rev().take(num_new_packets) {
                 page_dur = page_dur.saturating_add(packet.dur);
                 packet.pts = page_end_ts.saturating_sub(page_dur);
+                packet.dts = packet.pts as i64;
             }
 
             if self.gapless {