Skip to content

Commit 22db8ae

Browse files
committed
[scanner] Make variable names match CLI args
1 parent 01b788a commit 22db8ae

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

dvr_scan/scanner.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ def __init__(
259259

260260
# Motion Event Parameters (set_event_params)
261261
self._min_event_len = None # -l/--min-event-length
262-
self._pre_event_len = None # -tb/--time-before-event
263-
self._post_event_len = None # -tp/--time-post-event
262+
self._time_before_event = None # -tb/--time-before-event
263+
self._time_post_event = None # -tp/--time-post-event
264264
self._use_pts = None # --use_pts
265265

266266
# Region Parameters (set_region)
@@ -477,7 +477,7 @@ def set_event_params(
477477
"""Set motion event parameters."""
478478
assert self._input.framerate is not None
479479
self._min_event_len = FrameTimecode(min_event_len, self._input.framerate)
480-
self._pre_event_len = FrameTimecode(time_pre_event, self._input.framerate)
480+
self._time_before_event = FrameTimecode(time_pre_event, self._input.framerate)
481481
self._post_event_len = FrameTimecode(time_post_event, self._input.framerate)
482482
self._use_pts = use_pts
483483

@@ -708,7 +708,7 @@ def scan(self) -> ty.Optional[DetectionResult]:
708708

709709
# Correct event length parameters to account frame skip.
710710
post_event_len: int = self._post_event_len.frame_num // (self._frame_skip + 1)
711-
pre_event_len: int = self._pre_event_len.frame_num // (self._frame_skip + 1)
711+
pre_event_len: int = self._time_before_event.frame_num // (self._frame_skip + 1)
712712
min_event_len: int = max(self._min_event_len.frame_num // (self._frame_skip + 1), 1)
713713

714714
# Calculations below rely on min_event_len always being >= 1 (cannot be zero)
@@ -719,9 +719,9 @@ def scan(self) -> ty.Optional[DetectionResult]:
719719
# need to compensate for rounding errors when we corrected it for frame skip. This is
720720
# important as this affects the number of frames we consider for the actual motion event.
721721
start_event_shift_ms: float = (
722-
self._pre_event_len.get_seconds() + self._min_event_len.get_seconds()
722+
self._time_before_event.get_seconds() + self._min_event_len.get_seconds()
723723
) * 1000
724-
start_event_shift: int = self._pre_event_len.frame_num + min_event_len * (
724+
start_event_shift: int = self._time_before_event.frame_num + min_event_len * (
725725
self._frame_skip + 1
726726
)
727727

0 commit comments

Comments
 (0)