X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-core%2Fsrc%2Fframe.rs;h=80f1adf4c4b8b6b5e3511b0610ee104e47089492;hb=44fe5056fa05c27af8d3b77291e9c000316bd292;hp=f0794a86f9eeac3874bdfd2917c0aa3119304565;hpb=2c6462c81d1c18ccb26a6262400b33108e983820;p=nihav.git

diff --git a/nihav-core/src/frame.rs b/nihav-core/src/frame.rs
index f0794a8..80f1adf 100644
--- a/nihav-core/src/frame.rs
+++ b/nihav-core/src/frame.rs
@@ -969,6 +969,33 @@ impl NATimeInfo {
             }
         }
     }
+    fn get_cur_ts(&self) -> u64 { self.pts.unwrap_or(self.dts.unwrap_or(0)) }
+    fn get_cur_millis(&self) -> u64 {
+        let ts = self.get_cur_ts();
+        Self::ts_to_time(ts, 1000, self.tb_num, self.tb_den)
+    }
+    /// Checks whether the current time information is earler than provided reference time.
+    pub fn less_than(&self, time: NATimePoint) -> bool {
+        if self.pts.is_none() && self.dts.is_none() {
+            return true;
+        }
+        match time {
+            NATimePoint::PTS(rpts) => self.get_cur_ts() < rpts,
+            NATimePoint::Milliseconds(ms) => self.get_cur_millis() < ms,
+            NATimePoint::None => false,
+        }
+    }
+    /// Checks whether the current time information is the same as provided reference time.
+    pub fn equal(&self, time: NATimePoint) -> bool {
+        if self.pts.is_none() && self.dts.is_none() {
+            return time == NATimePoint::None;
+        }
+        match time {
+            NATimePoint::PTS(rpts) => self.get_cur_ts() == rpts,
+            NATimePoint::Milliseconds(ms) => self.get_cur_millis() == ms,
+            NATimePoint::None => false,
+        }
+    }
 }
 
 /// Time information for specifying durations or seek positions.
@@ -978,6 +1005,14 @@ pub enum NATimePoint {
     Milliseconds(u64),
     /// Stream timestamp.
     PTS(u64),
+    /// No time information present.
+    None,
+}
+
+impl Default for NATimePoint {
+    fn default() -> Self {
+        NATimePoint::None
+    }
 }
 
 impl fmt::Display for NATimePoint {
@@ -1013,6 +1048,9 @@ impl fmt::Display for NATimePoint {
             NATimePoint::PTS(pts) => {
                 write!(f, "{}pts", pts)
             },
+            NATimePoint::None => {
+                write!(f, "none")
+            },
         }
     }
 }
@@ -1073,7 +1111,7 @@ impl FromStr for NATimePoint {
                     let ret = parts.next().unwrap().parse::<u64>();
                     if ret.is_err() { return Err(FormatParseError {}); }
                     let seconds = ret.unwrap();
-                    if seconds >= 60 { return Err(FormatParseError {}); }
+                    if mins.is_some() && seconds >= 60 { return Err(FormatParseError {}); }
                     let millis = if let Some(val) = parts.next() {
                             let mut mval = 0;
                             let mut base = 0;