From ade215399c0dca208afcd8a5516ed30a8f8aaa2b Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 19 Aug 2020 10:25:33 +0300 Subject: [PATCH] Fix --- cvat/apps/engine/prepare.py | 4 ++-- cvat/apps/engine/task.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cvat/apps/engine/prepare.py b/cvat/apps/engine/prepare.py index f8d1ab4d..83a11f93 100644 --- a/cvat/apps/engine/prepare.py +++ b/cvat/apps/engine/prepare.py @@ -159,9 +159,9 @@ class PrepareInfo(WorkWithVideo): frame_number += 1 if frame_number < start_chunk_frame_number: continue - elif frame_number < end_chunk_frame_number and not (frame_number % step): + elif frame_number < end_chunk_frame_number and not ((frame_number - start_chunk_frame_number) % step): yield frame - elif frame_number % step: + elif (frame_number - start_chunk_frame_number) % step: continue else: self._close_video_container(container) diff --git a/cvat/apps/engine/task.py b/cvat/apps/engine/task.py index 546edb6e..08ecb275 100644 --- a/cvat/apps/engine/task.py +++ b/cvat/apps/engine/task.py @@ -316,7 +316,7 @@ def _create_thread(tid, data): numbers_sequence = range(db_data.start_frame, min(data['stop_frame'] if data['stop_frame'] else len(media_files), len(media_files)), db_data.get_frame_step()) m_paths = [] - m_paths = [(path, numb) for numb, path in enumerate(media_files) if numb in numbers_sequence] + m_paths = [(path, numb) for numb, path in enumerate(sorted(media_files)) if numb in numbers_sequence] for chunk_number, media_paths in itertools.groupby(m_paths, lambda x: next(counter_) // db_data.chunk_size): media_paths = list(media_paths)