[timecode] Add pts and time base properties

Author: Breakthrough

scenedetect/common.py

@@ -172,18 +172,14 @@ def __init__(
             TypeError: Thrown if either `timecode` or `fps` are unsupported types.
             ValueError: Thrown when specifying a negative timecode or framerate.
         """
-        # The following two properties are what is used to keep track of time
-        # in a frame-specific manner.  Note that once the framerate is set,
-        # the value should never be modified (only read if required).
-        # TODO(v1.0): Make these actual @properties.
-        self._framerate: Fraction = None
+        self._rate: Fraction = None
         self._frame_num = None
         self._timecode: ty.Optional[Timecode] = None
         self._seconds: ty.Optional[float] = None
 
         # Copy constructor.
         if isinstance(timecode, FrameTimecode):
-            self._framerate = timecode._framerate if fps is None else fps
+            self._rate = timecode._rate if fps is None else fps
             self._frame_num = timecode._frame_num
             self._timecode = timecode._timecode
             self._seconds = timecode._seconds
@@ -196,15 +192,15 @@ def __init__(
         if fps is None:
             raise TypeError("fps is a required argument.")
         if isinstance(fps, FrameTimecode):
-            self._framerate = fps._framerate
+            self._rate = fps._rate
         elif isinstance(fps, float):
             if fps <= MAX_FPS_DELTA:
                 raise ValueError("Framerate must be positive and greater than zero.")
-            self._framerate = Fraction.from_float(fps)
+            self._rate = Fraction.from_float(fps)
         elif isinstance(fps, Fraction):
             if float(fps) <= MAX_FPS_DELTA:
                 raise ValueError("Framerate must be positive and greater than zero.")
-            self._framerate = fps
+            self._rate = fps
         else:
             raise TypeError(
                 f"Wrong type for fps: {type(fps)} - expected float, Fraction, or FrameTimecode"
@@ -232,6 +228,8 @@ def __init__(
 
     @property
     def frame_num(self) -> ty.Optional[int]:
+        """The frame number. This value will be an estimate if the video is VFR. Prefer using the
+        `pts` property."""
         if self._timecode:
             # We need to audit anything currently using this property to guarantee temporal
             # consistency when handling VFR videos (i.e. no assumptions on fixed frame rate).
@@ -249,8 +247,24 @@ def frame_num(self) -> ty.Optional[int]:
         return self._frame_num
 
     @property
-    def framerate(self) -> ty.Optional[float]:
-        return float(self._framerate)
+    def framerate(self) -> float:
+        """The framerate to use for distance between frames and to calculate frame numbers.
+        For a VFR video, this may just be the average framerate."""
+        return float(self._rate)
+
+    @property
+    def time_base(self) -> Fraction:
+        """The time base in which presentation time is calculated."""
+        if self._timecode:
+            return self._timecode.time_base
+        return 1 / self._rate
+
+    @property
+    def pts(self) -> int:
+        """The presentation timestamp of the frame in units of `time_base`."""
+        if self._timecode:
+            return self._timecode.pts
+        return self.frame_num
 
     def get_frames(self) -> int:
         """[DEPRECATED] Get the current time/position in number of frames.
@@ -302,8 +316,7 @@ def seconds(self) -> float:
             return self._timecode.seconds
         if self._seconds:
             return self._seconds
-        # Assume constant framerate if we don't have timing information.
-        return float(self._frame_num) / self._framerate
+        return float(self._frame_num / self._rate)
 
     def get_seconds(self) -> float:
         """[DEPRECATED] Get the frame's position in number of seconds.
@@ -372,7 +385,7 @@ def _seconds_to_frames(self, seconds: float) -> int:
 
         *NOTE*: This will not be correct for variable framerate videos.
         """
-        return round(seconds * self._framerate)
+        return round(seconds * self._rate)
 
     def _parse_timecode_number(self, timecode: ty.Union[int, float]) -> int:
         """Parse a timecode number, storing it as the exact number of frames.
@@ -406,7 +419,7 @@ def _timecode_to_seconds(self, input: str) -> float:
         Raises:
             ValueError: Value could not be parsed correctly.
         """
-        assert self._framerate is not None and self._framerate > MAX_FPS_DELTA
+        assert self._rate is not None and self._rate > MAX_FPS_DELTA
         input = input.strip()
         # Exact number of frames N
         if input.isdigit():
@@ -452,7 +465,7 @@ def _get_other_as_frames(self, other: ty.Union[int, float, str, "FrameTimecode"]
             return self._seconds_to_frames(self._timecode_to_seconds(other))
         if isinstance(other, FrameTimecode):
             # If comparing two FrameTimecodes, they must have the same framerate for frame-based operations.
-            if self._framerate and other._framerate and not self.equal_framerate(other._framerate):
+            if self._rate and other._rate and not self.equal_framerate(other._rate):
                 raise ValueError(
                     "FrameTimecode instances require equal framerate for frame-based arithmetic."
                 )
@@ -530,7 +543,7 @@ def __iadd__(self, other: ty.Union[int, float, str, "FrameTimecode"]) -> "FrameT
                 time_base=timecode.time_base,
             )
             self._seconds = None
-            self._framerate = None
+            self._rate = None
             self._frame_num = None
             return self
 
@@ -573,7 +586,7 @@ def __isub__(self, other: ty.Union[int, float, str, "FrameTimecode"]) -> "FrameT
                 time_base=timecode.time_base,
             )
             self._seconds = None
-            self._framerate = None
+            self._rate = None
             self._frame_num = None
             return self
 
@@ -610,8 +623,8 @@ def __repr__(self) -> str:
         if self._timecode:
             return f"{self.get_timecode()} [pts={self._timecode.pts}, time_base={self._timecode.time_base}]"
         if self._seconds is not None:
-            return f"{self.get_timecode()} [seconds={self._seconds}, fps={self._framerate}]"
-        return f"{self.get_timecode()} [frame_num={self._frame_num}, fps={self._framerate}]"
+            return f"{self.get_timecode()} [seconds={self._seconds}, fps={self._rate}]"
+        return f"{self.get_timecode()} [frame_num={self._frame_num}, fps={self._rate}]"
 
     def __hash__(self) -> int:
         if self._timecode:
@@ -628,7 +641,7 @@ def _get_other_as_seconds(self, other: ty.Union[int, float, str, "FrameTimecode"
                 if _USE_PTS_IN_DEVELOPMENT and other == 1:
                     return self.seconds
                 raise NotImplementedError()
-            return float(other) / self._framerate
+            return float(other) / self._rate
         if isinstance(other, float):
             return other
         if isinstance(other, str):
@@ -639,4 +652,4 @@ def _get_other_as_seconds(self, other: ty.Union[int, float, str, "FrameTimecode"
 
 
 def _compare_as_fixed(a: FrameTimecode, b: ty.Any) -> bool:
-    return a._framerate is not None and isinstance(b, FrameTimecode) and b._framerate is not None
+    return a._rate is not None and isinstance(b, FrameTimecode) and b._rate is not None

scenedetect/output/image.py

@@ -293,7 +293,8 @@ def image_save_thread(self, save_queue: queue.Queue, progress_bar: tqdm):
     def generate_timecode_list(self, scene_list: SceneList) -> ty.List[ty.Iterable[FrameTimecode]]:
         """Generates a list of timecodes for each scene in `scene_list` based on the current config
         parameters."""
-        framerate = scene_list[0][0]._framerate
+        # TODO(v0.7): This needs to be fixed as part of PTS overhaul.
+        framerate = scene_list[0][0].framerate
         # TODO(v1.0): Split up into multiple sub-expressions so auto-formatter works correctly.
         return [
             (
@@ -450,7 +451,7 @@ def save_images(
     image_num_format = "%0"
     image_num_format += str(math.floor(math.log(num_images, 10)) + 2) + "d"
 
-    framerate = scene_list[0][0]._framerate
+    framerate = scene_list[0][0]._rate
 
     # TODO(v1.0): Split up into multiple sub-expressions so auto-formatter works correctly.
     timecode_list = [

website/pages/changelog.md

@@ -713,4 +713,5 @@ Although there have been minimal changes to most API examples, there are several
  * Deprecated functionality preserved from v0.6 now uses the `warnings` module
  * Add properties to access `frame_num`, `framerate`, and `seconds` from `FrameTimecode` instead of getter methods
  * Add new `Timecode` type to represent frame timings in terms of the video's source timebase
- * Expand `FrameTimecode` representations to preserve accuracy (previously all timecodes were rounded to frame boundaries)
+ * Add new `time_base` and `pts` properties to `FrameTimecode` to provide more accurate timing information
+