Revert "Early 0.18 work (#22138)" (#22142)

This reverts commit d24b96d3bb.

frigate/track/object_processing.py

@@ -185,7 +185,7 @@ class TrackedObjectProcessor(threading.Thread):
         def snapshot(camera: str, obj: TrackedObject) -> bool:
             mqtt_config: CameraMqttConfig = self.config.cameras[camera].mqtt
             if mqtt_config.enabled and self.should_mqtt_snapshot(camera, obj):
-                jpg_bytes, _ = obj.get_img_bytes(
+                jpg_bytes = obj.get_img_bytes(
                     ext="jpg",
                     timestamp=mqtt_config.timestamp,
                     bounding_box=mqtt_config.bounding_box,
@@ -515,7 +515,6 @@ class TrackedObjectProcessor(threading.Thread):
             duration,
             source_type,
             draw,
-            pre_capture,
         ) = payload
 
         # save the snapshot image
@@ -523,11 +522,6 @@ class TrackedObjectProcessor(threading.Thread):
             None, event_id, label, draw
         )
         end_time = frame_time + duration if duration is not None else None
-        start_time = (
-            frame_time - self.config.cameras[camera_name].record.event_pre_capture
-            if pre_capture is None
-            else frame_time - pre_capture
-        )
 
         # send event to event maintainer
         self.event_sender.publish(
@@ -542,7 +536,8 @@ class TrackedObjectProcessor(threading.Thread):
                     "sub_label": sub_label,
                     "score": score,
                     "camera": camera_name,
-                    "start_time": start_time,
+                    "start_time": frame_time
+                    - self.config.cameras[camera_name].record.event_pre_capture,
                     "end_time": end_time,
                     "has_clip": self.config.cameras[camera_name].record.enabled
                     and include_recording,