opensource/manim-slides
1
0
Fork 0
mirror of https://github.com/jeertmans/manim-slides.git synced 2025-06-10 23:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory problems

Browse Source
This commit is contained in:
Linus Heck
2021-06-27 13:53:06 +02:00
parent d1c3e9c075
commit ea171e1301
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
manim_presentation/present.py
View File

@ -57,8 +57,8 @@ class Presentation:
self.lastframe = [] self.lastframe = []
self.caps = [None for _ in self.files]
self.reset() self.reset()
self.load_files()
self.add_last_slide() self.add_last_slide()
def add_last_slide(self): def add_last_slide(self):
@ -73,17 +73,12 @@ class Presentation:
)) ))
def reset(self): def reset(self):
self.current_animation = 0 self.current_animation = 0
self.load_this_cap(0)
self.current_slide_i = 0 self.current_slide_i = 0
self.slides[-1]["terminated"] = False self.slides[-1]["terminated"] = False
def load_files(self):
self.caps = list()
for f in self.files:
self.caps.append(cv2.VideoCapture(f))
def next(self): def next(self):
if self.current_slide["type"] == "last": if self.current_slide["type"] == "last":
self.current_slide["terminated"] = True self.current_slide["terminated"] = True
@ -98,6 +93,16 @@ class Presentation:
def rewind_slide(self): def rewind_slide(self):
self.current_animation = self.current_slide["start_animation"] self.current_animation = self.current_slide["start_animation"]
self.current_cap.set(cv2.CAP_PROP_POS_FRAMES, 0) self.current_cap.set(cv2.CAP_PROP_POS_FRAMES, 0)
def load_this_cap(self,cap_number):
if self.caps[cap_number] == None:
# unload other caps
for i in range(len(self.caps)):
if self.caps[i] != None:
self.caps[i].release()
self.caps[i] = None
# load this cap
self.caps[cap_number] = cv2.VideoCapture(self.files[cap_number])
@property @property
def current_slide(self): def current_slide(self):
@ -105,6 +110,7 @@ class Presentation:
@property @property
def current_cap(self): def current_cap(self):
self.load_this_cap(self.current_animation)
return self.caps[self.current_animation] return self.caps[self.current_animation]
@property @property
@ -133,7 +139,9 @@ class Presentation:
# To fix "it always ends one frame before the animation", uncomment this. # To fix "it always ends one frame before the animation", uncomment this.
# But then clears on the next slide will clear the stationary after this slide. # But then clears on the next slide will clear the stationary after this slide.
if self.last_frame_next: if self.last_frame_next:
self.load_this_cap(self.next_cap)
self.next_cap = self.caps[self.current_animation + 1] self.next_cap = self.caps[self.current_animation + 1]
self.next_cap.set(cv2.CAP_PROP_POS_FRAMES, 0) self.next_cap.set(cv2.CAP_PROP_POS_FRAMES, 0)
_, self.lastframe = self.next_cap.read() _, self.lastframe = self.next_cap.read()
state = State.WAIT state = State.WAIT
@ -148,6 +156,7 @@ class Presentation:
else: else:
# Play next video! # Play next video!
self.current_animation += 1 self.current_animation += 1
self.load_this_cap(self.current_animation)
# Reset video to position zero if it has been played before # Reset video to position zero if it has been played before
self.current_cap.set(cv2.CAP_PROP_POS_FRAMES, 0) self.current_cap.set(cv2.CAP_PROP_POS_FRAMES, 0)