From 2e49e57bd6e95f510273a748eea9032c3aa6a443 Mon Sep 17 00:00:00 2001 From: Tony Cebzanov Date: Wed, 27 Nov 2019 20:51:47 -0500 Subject: [PATCH 1/2] Remove extraneous rows from CSV files. --- scenedetect/scene_manager.py | 6 +----- scenedetect/stats_manager.py | 14 +------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/scenedetect/scene_manager.py b/scenedetect/scene_manager.py index 82cce1cb..df3c61c4 100644 --- a/scenedetect/scene_manager.py +++ b/scenedetect/scene_manager.py @@ -126,10 +126,7 @@ def write_scene_list(output_csv_file, scene_list, cut_list=None): """ # type: (File, List[Tuple[FrameTimecode, FrameTimecode]], Optional[List[FrameTimecode]]) -> None csv_writer = get_csv_writer(output_csv_file) - # Output Timecode List - csv_writer.writerow( - ["Timecode List:"] + - cut_list if cut_list else [start.get_timecode() for start, _ in scene_list[1:]]) + csv_writer.writerow([ "Scene Number", "Start Frame", "Start Timecode", "Start Time (seconds)", @@ -626,4 +623,3 @@ def detect_scenes(self, frame_source, end_time=None, frame_skip=0, progress_bar.close() return num_frames - diff --git a/scenedetect/stats_manager.py b/scenedetect/stats_manager.py index 933a399c..cfe00287 100644 --- a/scenedetect/stats_manager.py +++ b/scenedetect/stats_manager.py @@ -61,7 +61,6 @@ ## StatsManager CSV File Column Names (Header Row) ## -COLUMN_NAME_FPS = "Frame Rate:" COLUMN_NAME_FRAME_NUMBER = "Frame Number" COLUMN_NAME_TIMECODE = "Timecode" @@ -249,7 +248,6 @@ def save_to_csv(self, csv_file, base_timecode, force_save=True): self._registered_metrics and self._frame_metrics): # Header rows. metric_keys = sorted(list(self._registered_metrics.union(self._loaded_metrics))) - csv_writer.writerow([COLUMN_NAME_FPS, '%.10f' % base_timecode.get_framerate()]) csv_writer.writerow( [COLUMN_NAME_FRAME_NUMBER, COLUMN_NAME_TIMECODE] + metric_keys) frame_keys = sorted(self._frame_metrics.keys()) @@ -298,16 +296,7 @@ def load_from_csv(self, csv_file, base_timecode=None, reset_save_required=True): except StopIteration: # If the file is blank or we couldn't decode anything, assume the file was empty. return num_frames - # First Row (FPS = [...]) and ensure framerate equals base_timecode if set. - if not len(row) == 2 or not row[0] == COLUMN_NAME_FPS: - raise StatsFileCorrupt() - stats_file_framerate = float(row[1]) - if stats_file_framerate < MINIMUM_FRAMES_PER_SECOND_FLOAT: - raise StatsFileCorrupt("Invalid framerate detected in CSV stats file " - "(decoded FPS: %f)." % stats_file_framerate) - if base_timecode is not None and not base_timecode.equal_framerate(stats_file_framerate): - raise StatsFileFramerateMismatch(base_timecode.get_framerate(), stats_file_framerate) - # Second Row: Frame Num, Timecode, [metrics...] + # First Row: Frame Num, Timecode, [metrics...] try: row = next(csv_reader) except StopIteration: @@ -359,4 +348,3 @@ def _metric_exists(self, frame_number, metric_key): # type: (int, List[str]) -> bool return (frame_number in self._frame_metrics and metric_key in self._frame_metrics[frame_number]) - From 2ced52b93362e2b22c3013e2b72d073ec929e1b6 Mon Sep 17 00:00:00 2001 From: Brandon Castellano Date: Sat, 9 Jan 2021 20:15:01 -0500 Subject: [PATCH 2/2] Trivial edit to trigger build. --- scenedetect/scene_manager.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scenedetect/scene_manager.py b/scenedetect/scene_manager.py index df3c61c4..7397ca82 100644 --- a/scenedetect/scene_manager.py +++ b/scenedetect/scene_manager.py @@ -68,7 +68,6 @@ from scenedetect.thirdparty.simpletable import SimpleTableRow, SimpleTable, HTMLPage - ## ## SceneManager Helper Functions ##