Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update slidding to take in count time_sequence param #56

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update slidding to take in count time_sequence param #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f65f7c
Update sliding.py
Fab16BSB Dec 18, 2021
fb354a3
Update sliding.py
Fab16BSB Dec 18, 2021
2dcd9cb
Update generator.py
Fab16BSB Dec 18, 2021
5bcc079
Merge pull request #2 from Fab16BSB/Fab16BSB-patch-2
Fab16BSB Dec 18, 2021
60398ae
Merge pull request #1 from Fab16BSB/Fab16BSB-patch-1
Fab16BSB Dec 18, 2021
77f47ac
Update sliding.py
Fab16BSB Dec 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/keras_video/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,16 +391,17 @@ def _get_classname(self, video: str) -> str:
return classname

def _get_frames(
self, video, nbframe, shape, force_no_headers=False
self, video, nbframe, shape, seq_time=0, force_no_headers=False
) -> Optional[Iterable]:
cap = cv.VideoCapture(video)
total_frames = self.count_frames(cap, video, force_no_headers)
fps = cap.get(cv.CAP_PROP_FPS)
orig_total = total_frames

if total_frames % 2 != 0:
total_frames += 1

frame_step = floor(total_frames / (nbframe - 1))
frame_step = floor(total_frames / (nbframe - 1)) if seq_time ==0 else floor((seq_time * fps) / (nbframe - 1))
# TODO: fix that, a tiny video can have a frame_step that is
# under 1
frame_step = max(1, frame_step)
Expand Down
5 changes: 4 additions & 1 deletion src/keras_video/sliding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ def __init_length(self):
else:
seqtime = int(frame_count)

# add an asssert to check if nbframe is possible in sequence_time
assert self.nbframe < seqtime, "ERROR nbframe > sequence_time change parameter and restart !"

stop_at = int(seqtime - self.nbframe)
step = np.ceil(seqtime / self.nbframe).astype(np.int) - 1
i = 0
Expand Down Expand Up @@ -172,7 +175,7 @@ def __getitem__(self, idx):

video_id = vid["id"]
if video_id not in self.__frame_cache:
frames: Iterable = self._get_frames(video, nbframe, shape)
frames: Iterable = self._get_frames(video, nbframe, shape, self.sequence_time if self.sequence_time != None else 0)
else:
frames: Iterable = self.__frame_cache[video_id]

Expand Down