Remove user timestamp helper methods

Author: ladvoc

examples/data_tracks/publisher.py

@@ -1,6 +1,7 @@
 import os
 import logging
 import asyncio
+import time
 from signal import SIGINT, SIGTERM
 from livekit import rtc
 
@@ -19,7 +20,7 @@ async def push_frames(track: rtc.LocalDataTrack):
         logging.info("Pushing frame")
         data = await read_sensor()
         try:
-            frame = rtc.DataTrackFrame(payload=data).with_user_timestamp_now()
+            frame = rtc.DataTrackFrame(payload=data, user_timestamp=int(time.time() * 1000))
             track.try_push(frame)
         except rtc.PushFrameError as e:
             logging.error("Failed to push frame: %s", e)

examples/data_tracks/subscriber.py

@@ -1,6 +1,7 @@
 import os
 import logging
 import asyncio
+import time
 from signal import SIGINT, SIGTERM
 from livekit import rtc
 
@@ -19,8 +20,8 @@ async def subscribe(track: rtc.RemoteDataTrack):
         async for frame in track.subscribe():
             logging.info("Received frame (%d bytes)", len(frame.payload))
 
-            latency = frame.duration_since_timestamp()
-            if latency is not None:
+            if frame.user_timestamp is not None:
+                latency = (int(time.time() * 1000) - frame.user_timestamp) / 1000.0
                 logging.info("Latency: %.3f s", latency)
     except rtc.SubscribeDataTrackError as e:
         logging.error("Failed to subscribe to '%s': %s", track.info.name, e.message)

livekit-rtc/livekit/rtc/data_track.py

@@ -14,7 +14,6 @@
 
 from __future__ import annotations
 
-import time
 from dataclasses import dataclass
 from typing import AsyncIterator, Optional
 
@@ -72,32 +71,6 @@ class DataTrackFrame:
     user_timestamp: Optional[int] = None
     """The frame's user timestamp, if one is associated."""
 
-    def with_user_timestamp_now(self) -> DataTrackFrame:
-        """Associates the current Unix timestamp (in milliseconds) with the frame.
-
-        Returns a new ``DataTrackFrame`` with the timestamp set; the original is
-        not modified.
-        """
-        return DataTrackFrame(
-            payload=self.payload,
-            user_timestamp=int(time.time() * 1000),
-        )
-
-    def duration_since_timestamp(self) -> Optional[float]:
-        """If the frame has a user timestamp, calculate how long has passed
-        relative to the current system time.
-
-        The timestamp is assumed to be a Unix timestamp in milliseconds
-        (as set by :meth:`with_user_timestamp_now` on the publisher side).
-
-        Returns:
-            The elapsed duration in seconds, or ``None`` if no timestamp is set.
-        """
-        if self.user_timestamp is None:
-            return None
-        elapsed_ms = int(time.time() * 1000) - self.user_timestamp
-        return elapsed_ms / 1000.0
-
 
 class LocalDataTrack:
     """Data track published by the local participant."""

tests/rtc/test_e2e.py

@@ -20,6 +20,7 @@
 
 import asyncio
 import os
+import time
 import uuid
 from typing import Callable, TypeVar
 import numpy as np
@@ -493,8 +494,9 @@ def on_data_track_unpublished(sid: str):
         async def push_frames():
             for i in range(FRAME_COUNT):
                 frame = rtc.DataTrackFrame(
-                    payload=bytes([i] * PAYLOAD_SIZE)
-                ).with_user_timestamp_now()
+                    payload=bytes([i] * PAYLOAD_SIZE),
+                    user_timestamp=int(time.time() * 1000),
+                )
                 local_track.try_push(frame)
                 await asyncio.sleep(0.1)
             local_track.unpublish()
@@ -507,9 +509,9 @@ async def publish_and_receive():
                 assert all(b == first_byte for b in frame.payload), "Payload bytes are not uniform"
                 assert len(frame.payload) == PAYLOAD_SIZE
                 assert frame.user_timestamp is not None
-                latency = frame.duration_since_timestamp()
-                assert latency is not None and latency < 5.0, (
-                    f"Timestamp latency too high or missing: {latency}"
+                latency = (int(time.time() * 1000) - frame.user_timestamp) / 1000.0
+                assert latency < 5.0, (
+                    f"Timestamp latency too high: {latency}"
                 )
                 recv_count += 1
             await push_task