mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-03-19 22:58:22 +03:00
Fix preview frame tracking and partial file cleanup
- write_frame_to_cache() now returns bool; callers only append the timestamp to output_frames when cv2.imwrite() actually succeeded, preventing dangling timestamps that cause ffmpeg "Impossible to open" errors when the cache disk is full - FFMpegConverter removes the partial output mp4 on ffmpeg failure so stale partial files don't accumulate on the recording disk https://claude.ai/code/session_016bxjbVpx8DqpjysnGYmXdx
This commit is contained in:
parent
c8ac840b85
commit
8433e16558
@ -201,6 +201,7 @@ class FFMpegConverter(threading.Thread):
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
logger.error(f"Error saving preview for {self.config.name} :: {p.stderr}")
|
logger.error(f"Error saving preview for {self.config.name} :: {p.stderr}")
|
||||||
|
Path(self.path).unlink(missing_ok=True)
|
||||||
|
|
||||||
# unlink files from cache
|
# unlink files from cache
|
||||||
# don't delete last frame as it will be used as first frame in next segment
|
# don't delete last frame as it will be used as first frame in next segment
|
||||||
@ -345,7 +346,7 @@ class PreviewRecorder:
|
|||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def write_frame_to_cache(self, frame_time: float, frame: np.ndarray) -> None:
|
def write_frame_to_cache(self, frame_time: float, frame: np.ndarray) -> bool:
|
||||||
# resize yuv frame
|
# resize yuv frame
|
||||||
small_frame = np.zeros((self.out_height * 3 // 2, self.out_width), np.uint8)
|
small_frame = np.zeros((self.out_height * 3 // 2, self.out_width), np.uint8)
|
||||||
copy_yuv_to_position(
|
copy_yuv_to_position(
|
||||||
@ -360,7 +361,7 @@ class PreviewRecorder:
|
|||||||
small_frame,
|
small_frame,
|
||||||
cv2.COLOR_YUV2BGR_I420,
|
cv2.COLOR_YUV2BGR_I420,
|
||||||
)
|
)
|
||||||
cv2.imwrite(
|
result = cv2.imwrite(
|
||||||
get_cache_image_name(self.config.name, frame_time),
|
get_cache_image_name(self.config.name, frame_time),
|
||||||
small_frame,
|
small_frame,
|
||||||
[
|
[
|
||||||
@ -368,6 +369,11 @@ class PreviewRecorder:
|
|||||||
PREVIEW_QUALITY_WEBP[self.config.record.preview.quality],
|
PREVIEW_QUALITY_WEBP[self.config.record.preview.quality],
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
if not result:
|
||||||
|
logger.warning(
|
||||||
|
f"Failed to write preview frame for {self.config.name} at {frame_time}, likely no space in cache"
|
||||||
|
)
|
||||||
|
return result
|
||||||
|
|
||||||
def write_data(
|
def write_data(
|
||||||
self,
|
self,
|
||||||
@ -381,8 +387,8 @@ class PreviewRecorder:
|
|||||||
# always write the first frame
|
# always write the first frame
|
||||||
if self.start_time == 0:
|
if self.start_time == 0:
|
||||||
self.start_time = frame_time
|
self.start_time = frame_time
|
||||||
self.output_frames.append(frame_time)
|
if self.write_frame_to_cache(frame_time, frame):
|
||||||
self.write_frame_to_cache(frame_time, frame)
|
self.output_frames.append(frame_time)
|
||||||
return
|
return
|
||||||
|
|
||||||
# check if PREVIEW clip should be generated and cached frames reset
|
# check if PREVIEW clip should be generated and cached frames reset
|
||||||
@ -390,8 +396,8 @@ class PreviewRecorder:
|
|||||||
if len(self.output_frames) > 0:
|
if len(self.output_frames) > 0:
|
||||||
# save last frame to ensure consistent duration
|
# save last frame to ensure consistent duration
|
||||||
if self.config.record:
|
if self.config.record:
|
||||||
self.output_frames.append(frame_time)
|
if self.write_frame_to_cache(frame_time, frame):
|
||||||
self.write_frame_to_cache(frame_time, frame)
|
self.output_frames.append(frame_time)
|
||||||
|
|
||||||
# write the preview if any frames exist for this hour
|
# write the preview if any frames exist for this hour
|
||||||
FFMpegConverter(
|
FFMpegConverter(
|
||||||
@ -409,13 +415,13 @@ class PreviewRecorder:
|
|||||||
|
|
||||||
# include first frame to ensure consistent duration
|
# include first frame to ensure consistent duration
|
||||||
if self.config.record.enabled:
|
if self.config.record.enabled:
|
||||||
self.output_frames.append(frame_time)
|
if self.write_frame_to_cache(frame_time, frame):
|
||||||
self.write_frame_to_cache(frame_time, frame)
|
self.output_frames.append(frame_time)
|
||||||
|
|
||||||
return
|
return
|
||||||
elif self.should_write_frame(current_tracked_objects, motion_boxes, frame_time):
|
elif self.should_write_frame(current_tracked_objects, motion_boxes, frame_time):
|
||||||
self.output_frames.append(frame_time)
|
if self.write_frame_to_cache(frame_time, frame):
|
||||||
self.write_frame_to_cache(frame_time, frame)
|
self.output_frames.append(frame_time)
|
||||||
return
|
return
|
||||||
|
|
||||||
def flag_offline(self, frame_time: float) -> None:
|
def flag_offline(self, frame_time: float) -> None:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user