core: convert pts to i64

Author: sscobici

symphonia-core/src/formats/mod.rs

@@ -485,7 +485,7 @@ pub struct Packet {
     /// this timestamp is relative to the end of the encoder delay.
     ///
     /// This timestamp is in `TimeBase` units.
-    pub pts: u64,
+    pub pts: i64,
     /// 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
     ///
@@ -511,7 +511,7 @@ impl Packet {
     pub fn new_from_slice(track_id: u32, pts: u64, dur: u64, buf: &[u8]) -> Self {
         Packet {
             track_id,
-            pts,
+            pts: pts as i64,
             dts: pts as i64,
             dur,
             trim_start: 0,
@@ -522,13 +522,13 @@ impl Packet {
 
     /// 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, dts: pts as i64, dur, trim_start: 0, trim_end: 0, data }
+        Packet { track_id, pts: pts as i64, 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,
+        pts: i64,
         dts: i64,
         dur: u64,
         data: Box<[u8]>,
@@ -545,7 +545,15 @@ impl Packet {
         trim_end: u32,
         buf: &[u8],
     ) -> Self {
-        Packet { track_id, pts, dts: pts as i64, dur, trim_start, trim_end, data: Box::from(buf) }
+        Packet {
+            track_id,
+            pts: pts as i64,
+            dts: pts as i64,
+            dur,
+            trim_start,
+            trim_end,
+            data: Box::from(buf),
+        }
     }
 
     /// Create a new `Packet` with trimming information from a boxed slice.
@@ -557,7 +565,7 @@ impl Packet {
         trim_end: u32,
         data: Box<[u8]>,
     ) -> Self {
-        Packet { track_id, pts, dts: pts as i64, dur, trim_start, trim_end, data }
+        Packet { track_id, pts: pts as i64, dts: pts as i64, dur, trim_start, trim_end, data }
     }
 
     /// The track identifier of the track this packet belongs to.
@@ -569,7 +577,7 @@ impl Packet {
     ///
     /// For audio packets, when gapless support is enabled,
     /// this timestamp is relative to the end of the encoder delay.
-    pub fn pts(&self) -> u64 {
+    pub fn pts(&self) -> i64 {
         self.pts
     }
 
@@ -752,21 +760,21 @@ pub mod util {
     /// Given a `Packet`, the encoder delay in frames, and the number of non-delay or padding
     /// frames, adjust the packet's timestamp and duration, and populate the trim information.
     pub fn trim_packet(packet: &mut Packet, delay: u32, num_frames: Option<u64>) {
-        packet.trim_start = if packet.pts < u64::from(delay) {
-            let trim = (u64::from(delay) - packet.pts).min(packet.dur);
+        packet.trim_start = if packet.pts < i64::from(delay) {
+            let trim = (delay as u64 - packet.pts as u64).min(packet.dur);
             packet.pts = 0;
             packet.dts = 0;
             packet.dur -= trim;
             trim as u32
         }
         else {
-            packet.pts -= u64::from(delay);
+            packet.pts -= i64::from(delay);
             0
         };
 
         if let Some(num_frames) = num_frames {
-            packet.trim_end = if packet.pts + packet.dur > num_frames {
-                let trim = (packet.pts + packet.dur - num_frames).min(packet.dur);
+            packet.trim_end = if packet.pts as u64 + packet.dur > num_frames {
+                let trim = (packet.pts as u64 + packet.dur - num_frames).min(packet.dur);
                 packet.dur -= trim;
                 trim as u32
             }

symphonia-format-ogg/src/demuxer.rs

@@ -249,8 +249,9 @@ impl<'s> OggReader<'s> {
         let actual_ts = loop {
             match self.peek_logical_packet() {
                 Some(packet) => {
-                    if packet.track_id() == serial && packet.pts + packet.dur >= required_ts {
-                        break packet.pts;
+                    if packet.track_id() == serial && packet.pts as u64 + packet.dur >= required_ts
+                    {
+                        break packet.pts as u64;
                     }
 
                     self.discard_logical_packet();

symphonia-format-ogg/src/logical.rs

@@ -198,8 +198,8 @@ 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;
+                packet.pts = page_end_ts.saturating_sub(page_dur) as i64;
+                packet.dts = packet.pts;
             }
 
             if self.gapless {

symphonia-play/src/main.rs

@@ -470,9 +470,9 @@ fn play_track(
                 // should be decoded and *samples* discarded up-to the exact *sample* indicated by
                 // required_ts. The current approach will discard extra samples if seeking to a
                 // sample within a packet.
-                if packet.pts() >= opts.seek_ts {
+                if packet.pts() as u64 >= opts.seek_ts {
                     if !opts.no_progress {
-                        ui::print_progress(packet.pts(), dur, tb);
+                        ui::print_progress(packet.pts() as u64, dur, tb);
                     }
 
                     if let Some(audio_output) = audio_output {