remove last_user_timestamp

Author: chenosaurus

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "local_video"
-version = "0.1.0"
+version = "0.2.0"
 edition.workspace = true
 publish = false
 

examples/local_video/Cargo.toml

@@ -135,10 +135,10 @@ fn current_timestamp_us() -> i64 {
 }
 
 /// Format a user timestamp (microseconds since Unix epoch) as
-/// `yyyy-mm-dd hh:mm:ss.ssss`.
+/// `yyyy-mm-dd hh:mm:ss:xxx` where xxx is milliseconds.
 fn format_timestamp_us(ts_us: i64) -> String {
     DateTime::<Utc>::from_timestamp_micros(ts_us)
-        .map(|dt| dt.format("%Y-%m-%d %H:%M:%S%.4f").to_string())
+        .map(|dt| dt.format("%Y-%m-%d %H:%M:%S:").to_string() + &format!("{:03}", dt.timestamp_subsec_millis()))
         .unwrap_or_else(|| format!("<invalid timestamp {ts_us}>"))
 }
 

examples/local_video/src/subscriber.rs

@@ -60,21 +60,6 @@ impl UserTimestampHandler {
         self.sys_handle.enabled()
     }
 
-    /// Get the last received user timestamp (receiver side only).
-    /// Returns None if no timestamp has been received yet.
-    pub fn last_user_timestamp(&self) -> Option<i64> {
-        if self.sys_handle.has_user_timestamp() {
-            let ts = self.sys_handle.last_user_timestamp();
-            if ts >= 0 {
-                Some(ts)
-            } else {
-                None
-            }
-        } else {
-            None
-        }
-    }
-
     /// Lookup the user timestamp for a given RTP timestamp (receiver side).
     /// Returns None if no timestamp was found for this RTP timestamp.
     /// The entry is removed from the map after a successful lookup.

libwebrtc/src/native/user_timestamp.rs

@@ -94,15 +94,6 @@ impl RemoteVideoTrack {
         true
     }
 
-    /// Returns the last parsed user timestamp (in microseconds) for this
-    /// remote video track, if the user timestamp transformer is enabled and
-    /// a timestamp has been received.
-    pub fn last_user_timestamp(&self) -> Option<i64> {
-        self.rtc_track()
-            .user_timestamp_handler()
-            .and_then(|h| h.last_user_timestamp())
-    }
-
     /// Returns a clone of the user timestamp handler, if one has been set.
     pub fn user_timestamp_handler(&self) -> Option<UserTimestampHandler> {
         self.rtc_track().user_timestamp_handler()

livekit/src/room/track/remote_video_track.rs

@@ -82,9 +82,6 @@ class UserTimestampTransformer : public webrtc::FrameTransformerInterface {
   void set_enabled(bool enabled);
   bool enabled() const;
 
-  /// Get the last received user timestamp (receiver side only)
-  std::optional<int64_t> last_user_timestamp() const;
-
   /// Lookup the user timestamp associated with a given RTP timestamp.
   /// Returns the user timestamp if found, nullopt otherwise.
   /// The entry is removed from the map after lookup.
@@ -121,9 +118,6 @@ class UserTimestampTransformer : public webrtc::FrameTransformerInterface {
   std::unordered_map<uint32_t,
                      rtc::scoped_refptr<webrtc::TransformedFrameCallback>>
       sink_callbacks_;
-  mutable std::atomic<int64_t> last_user_timestamp_{0};
-  mutable std::atomic<bool> has_last_user_timestamp_{false};
-
   // Send-side map: capture timestamp (us) -> user timestamp (us).
   // Populated by store_user_timestamp(), consumed by TransformSend()
   // via CaptureTime() lookup.
@@ -159,17 +153,10 @@ class UserTimestampHandler {
   void set_enabled(bool enabled) const;
   bool enabled() const;
 
-  /// Get the last received user timestamp (receiver side only)
-  /// Returns -1 if no timestamp has been received yet
-  int64_t last_user_timestamp() const;
-
   /// Lookup the user timestamp for a given RTP timestamp (receiver side).
   /// Returns -1 if not found.
   int64_t lookup_user_timestamp(uint32_t rtp_timestamp) const;
 
-  /// Check if a user timestamp has been received
-  bool has_user_timestamp() const;
-
   /// Store a user timestamp for a given capture timestamp (sender side).
   /// Call this when capturing a video frame with a user timestamp.
   void store_user_timestamp(int64_t capture_timestamp_us,

webrtc-sys/include/livekit/user_timestamp.h

@@ -170,10 +170,6 @@ void UserTimestampTransformer::TransformReceive(
     double recv_latency_ms =
         static_cast<double>(now_us - user_ts.value()) / 1000.0;
 
-    // Store the extracted timestamp for later retrieval (legacy atomic)
-    last_user_timestamp_.store(user_ts.value());
-    has_last_user_timestamp_.store(true);
-
     // Store in the receive map keyed by RTP timestamp so decoded frames
     // can look up their user timestamp regardless of frame drops.
     {
@@ -333,14 +329,6 @@ bool UserTimestampTransformer::enabled() const {
   return enabled_.load();
 }
 
-std::optional<int64_t> UserTimestampTransformer::last_user_timestamp()
-    const {
-  if (!has_last_user_timestamp_.load()) {
-    return std::nullopt;
-  }
-  return last_user_timestamp_.load();
-}
-
 std::optional<int64_t> UserTimestampTransformer::lookup_user_timestamp(
     uint32_t rtp_timestamp) {
   webrtc::MutexLock lock(&recv_map_mutex_);
@@ -422,20 +410,11 @@ bool UserTimestampHandler::enabled() const {
   return transformer_->enabled();
 }
 
-int64_t UserTimestampHandler::last_user_timestamp() const {
-  auto ts = transformer_->last_user_timestamp();
-  return ts.value_or(-1);
-}
-
 int64_t UserTimestampHandler::lookup_user_timestamp(uint32_t rtp_timestamp) const {
   auto ts = transformer_->lookup_user_timestamp(rtp_timestamp);
   return ts.value_or(-1);
 }
 
-bool UserTimestampHandler::has_user_timestamp() const {
-  return transformer_->last_user_timestamp().has_value();
-}
-
 void UserTimestampHandler::store_user_timestamp(
     int64_t capture_timestamp_us,
     int64_t user_timestamp_us) const {

webrtc-sys/src/user_timestamp.cpp

@@ -35,17 +35,10 @@ pub mod ffi {
         /// Check if timestamp embedding is enabled.
         fn enabled(self: &UserTimestampHandler) -> bool;
 
-        /// Get the last received user timestamp (receiver side only).
-        /// Returns -1 if no timestamp has been received yet.
-        fn last_user_timestamp(self: &UserTimestampHandler) -> i64;
-
         /// Lookup the user timestamp for a given RTP timestamp (receiver side).
         /// Returns -1 if not found. The entry is removed after lookup.
         fn lookup_user_timestamp(self: &UserTimestampHandler, rtp_timestamp: u32) -> i64;
 
-        /// Check if a user timestamp has been received.
-        fn has_user_timestamp(self: &UserTimestampHandler) -> bool;
-
         /// Store a user timestamp for a given capture timestamp (sender side).
         /// Call this when capturing a video frame with a user timestamp.
         fn store_user_timestamp(