diff --git a/cinema/gb/window/007wne-hud/baseline_0000.png b/cinema/gb/window/007wne-hud/baseline_0000.png index 9ae2a2a5c..6fb7af9b1 100644 Binary files a/cinema/gb/window/007wne-hud/baseline_0000.png and b/cinema/gb/window/007wne-hud/baseline_0000.png differ diff --git a/cinema/gb/window/007wne-hud/baseline_0001.png b/cinema/gb/window/007wne-hud/baseline_0001.png index 9ae2a2a5c..6fb7af9b1 100644 Binary files a/cinema/gb/window/007wne-hud/baseline_0001.png and b/cinema/gb/window/007wne-hud/baseline_0001.png differ diff --git a/cinema/gb/window/007wne-hud/baseline_0002.png b/cinema/gb/window/007wne-hud/baseline_0002.png index 9ae2a2a5c..6fb7af9b1 100644 Binary files a/cinema/gb/window/007wne-hud/baseline_0002.png and b/cinema/gb/window/007wne-hud/baseline_0002.png differ diff --git a/cinema/gb/window/007wne-hud/baseline_0003.png b/cinema/gb/window/007wne-hud/baseline_0003.png index 9ae2a2a5c..6fb7af9b1 100644 Binary files a/cinema/gb/window/007wne-hud/baseline_0003.png and b/cinema/gb/window/007wne-hud/baseline_0003.png differ diff --git a/cinema/gb/window/ccmmr-hud/baseline_0000.png b/cinema/gb/window/ccmmr-hud/baseline_0000.png index 75fc1974e..e2cb469e9 100644 Binary files a/cinema/gb/window/ccmmr-hud/baseline_0000.png and b/cinema/gb/window/ccmmr-hud/baseline_0000.png differ diff --git a/cinema/gb/window/ccmmr-hud/baseline_0001.png b/cinema/gb/window/ccmmr-hud/baseline_0001.png index 75fc1974e..e2cb469e9 100644 Binary files a/cinema/gb/window/ccmmr-hud/baseline_0001.png and b/cinema/gb/window/ccmmr-hud/baseline_0001.png differ diff --git a/cinema/gb/window/ccmmr-hud/baseline_0002.png b/cinema/gb/window/ccmmr-hud/baseline_0002.png index 75fc1974e..e2cb469e9 100644 Binary files a/cinema/gb/window/ccmmr-hud/baseline_0002.png and b/cinema/gb/window/ccmmr-hud/baseline_0002.png differ diff --git a/cinema/gb/window/ccmmr-hud/baseline_0003.png b/cinema/gb/window/ccmmr-hud/baseline_0003.png index b64e44668..22ab091b2 100644 Binary files a/cinema/gb/window/ccmmr-hud/baseline_0003.png and b/cinema/gb/window/ccmmr-hud/baseline_0003.png differ diff --git a/cinema/gb/window/ccmmr-hud/baseline_0004.png b/cinema/gb/window/ccmmr-hud/baseline_0004.png deleted file mode 100644 index b64e44668..000000000 Binary files a/cinema/gb/window/ccmmr-hud/baseline_0004.png and /dev/null differ diff --git a/cinema/gb/window/ccmmr-hud/baseline_0005.png b/cinema/gb/window/ccmmr-hud/baseline_0005.png deleted file mode 100644 index 9209c6402..000000000 Binary files a/cinema/gb/window/ccmmr-hud/baseline_0005.png and /dev/null differ diff --git a/cinema/gb/window/kdt-battle/baseline_0000.png b/cinema/gb/window/kdt-battle/baseline_0000.png index 2ba1aa28b..b750cca02 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0000.png and b/cinema/gb/window/kdt-battle/baseline_0000.png differ diff --git a/cinema/gb/window/kdt-battle/baseline_0001.png b/cinema/gb/window/kdt-battle/baseline_0001.png index 2ba1aa28b..b750cca02 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0001.png and b/cinema/gb/window/kdt-battle/baseline_0001.png differ diff --git a/cinema/gb/window/kdt-battle/baseline_0002.png b/cinema/gb/window/kdt-battle/baseline_0002.png index 2ba1aa28b..b750cca02 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0002.png and b/cinema/gb/window/kdt-battle/baseline_0002.png differ diff --git a/cinema/gb/window/kdt-battle/baseline_0003.png b/cinema/gb/window/kdt-battle/baseline_0003.png index 2ba1aa28b..b750cca02 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0003.png and b/cinema/gb/window/kdt-battle/baseline_0003.png differ diff --git a/cinema/gb/window/kdt-battle/baseline_0004.png b/cinema/gb/window/kdt-battle/baseline_0004.png index 2ba1aa28b..b750cca02 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0004.png and b/cinema/gb/window/kdt-battle/baseline_0004.png differ diff --git a/cinema/gb/window/kdt-battle/baseline_0005.png b/cinema/gb/window/kdt-battle/baseline_0005.png index 2ba1aa28b..b750cca02 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0005.png and b/cinema/gb/window/kdt-battle/baseline_0005.png differ diff --git a/cinema/gb/window/kdt-battle/baseline_0006.png b/cinema/gb/window/kdt-battle/baseline_0006.png index 2ba1aa28b..b750cca02 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0006.png and b/cinema/gb/window/kdt-battle/baseline_0006.png differ diff --git a/cinema/gb/window/kdt-battle/baseline_0007.png b/cinema/gb/window/kdt-battle/baseline_0007.png index 2491849a8..28e473277 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0007.png and b/cinema/gb/window/kdt-battle/baseline_0007.png differ diff --git a/cinema/gb/window/kdt-battle/baseline_0008.png b/cinema/gb/window/kdt-battle/baseline_0008.png index 2491849a8..28e473277 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0008.png and b/cinema/gb/window/kdt-battle/baseline_0008.png differ diff --git a/cinema/gb/window/kdt-battle/baseline_0009.png b/cinema/gb/window/kdt-battle/baseline_0009.png index 2491849a8..28e473277 100644 Binary files a/cinema/gb/window/kdt-battle/baseline_0009.png and b/cinema/gb/window/kdt-battle/baseline_0009.png differ diff --git a/cinema/gb/window/rfs-hud/baseline_0000.png b/cinema/gb/window/rfs-hud/baseline_0000.png index a4199c67a..4236bc539 100644 Binary files a/cinema/gb/window/rfs-hud/baseline_0000.png and b/cinema/gb/window/rfs-hud/baseline_0000.png differ diff --git a/cinema/gb/window/rfs-hud/baseline_0001.png b/cinema/gb/window/rfs-hud/baseline_0001.png deleted file mode 100644 index a4199c67a..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0001.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0002.png b/cinema/gb/window/rfs-hud/baseline_0002.png deleted file mode 100644 index d8c767203..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0002.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0003.png b/cinema/gb/window/rfs-hud/baseline_0003.png deleted file mode 100644 index d8c767203..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0003.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0004.png b/cinema/gb/window/rfs-hud/baseline_0004.png deleted file mode 100644 index d8c767203..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0004.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0005.png b/cinema/gb/window/rfs-hud/baseline_0005.png deleted file mode 100644 index d8c767203..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0005.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0006.png b/cinema/gb/window/rfs-hud/baseline_0006.png deleted file mode 100644 index 7489e9768..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0006.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0007.png b/cinema/gb/window/rfs-hud/baseline_0007.png deleted file mode 100644 index 7489e9768..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0007.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0008.png b/cinema/gb/window/rfs-hud/baseline_0008.png deleted file mode 100644 index 7489e9768..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0008.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0009.png b/cinema/gb/window/rfs-hud/baseline_0009.png deleted file mode 100644 index 7489e9768..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0009.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0010.png b/cinema/gb/window/rfs-hud/baseline_0010.png deleted file mode 100644 index 334806217..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0010.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0011.png b/cinema/gb/window/rfs-hud/baseline_0011.png deleted file mode 100644 index 334806217..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0011.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0012.png b/cinema/gb/window/rfs-hud/baseline_0012.png deleted file mode 100644 index 334806217..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0012.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0013.png b/cinema/gb/window/rfs-hud/baseline_0013.png deleted file mode 100644 index 334806217..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0013.png and /dev/null differ diff --git a/cinema/gb/window/rfs-hud/baseline_0014.png b/cinema/gb/window/rfs-hud/baseline_0014.png deleted file mode 100644 index 7c444e005..000000000 Binary files a/cinema/gb/window/rfs-hud/baseline_0014.png and /dev/null differ diff --git a/cinema/gb/window/wmm-hud/baseline_0000.png b/cinema/gb/window/wmm-hud/baseline_0000.png index bf01a3469..3a7096b58 100644 Binary files a/cinema/gb/window/wmm-hud/baseline_0000.png and b/cinema/gb/window/wmm-hud/baseline_0000.png differ diff --git a/cinema/gb/window/zin-head/baseline_0000.png b/cinema/gb/window/zin-head/baseline_0000.png index d3c2c0f9d..41cd69861 100644 Binary files a/cinema/gb/window/zin-head/baseline_0000.png and b/cinema/gb/window/zin-head/baseline_0000.png differ diff --git a/cinema/gb/window/zin-head/baseline_0001.png b/cinema/gb/window/zin-head/baseline_0001.png index 5d583d227..f8e0b3711 100644 Binary files a/cinema/gb/window/zin-head/baseline_0001.png and b/cinema/gb/window/zin-head/baseline_0001.png differ diff --git a/cinema/gb/window/zin-head/baseline_0002.png b/cinema/gb/window/zin-head/baseline_0002.png index 5d583d227..f8e0b3711 100644 Binary files a/cinema/gb/window/zin-head/baseline_0002.png and b/cinema/gb/window/zin-head/baseline_0002.png differ diff --git a/cinema/gb/window/zin-head/baseline_0003.png b/cinema/gb/window/zin-head/baseline_0003.png index 5d583d227..f8e0b3711 100644 Binary files a/cinema/gb/window/zin-head/baseline_0003.png and b/cinema/gb/window/zin-head/baseline_0003.png differ diff --git a/cinema/gb/window/zin-head/baseline_0004.png b/cinema/gb/window/zin-head/baseline_0004.png index 5d583d227..f8e0b3711 100644 Binary files a/cinema/gb/window/zin-head/baseline_0004.png and b/cinema/gb/window/zin-head/baseline_0004.png differ diff --git a/cinema/gb/window/zin-head/baseline_0005.png b/cinema/gb/window/zin-head/baseline_0005.png index d3c2c0f9d..41cd69861 100644 Binary files a/cinema/gb/window/zin-head/baseline_0005.png and b/cinema/gb/window/zin-head/baseline_0005.png differ diff --git a/src/platform/python/cinema/movie.py b/src/platform/python/cinema/movie.py index d1a8d9f60..5f5402c99 100644 --- a/src/platform/python/cinema/movie.py +++ b/src/platform/python/cinema/movie.py @@ -8,15 +8,17 @@ Output = namedtuple('Output', ['video']) class Tracer(object): def __init__(self, core): self.core = core - self.framebuffer = Image(*core.desired_video_dimensions()) - self.core.set_video_buffer(self.framebuffer) self._video_fifo = [] def yield_frames(self, skip=0, limit=None): + self.framebuffer = Image(*self.core.desired_video_dimensions()) + self.core.set_video_buffer(self.framebuffer) self.core.reset() skip = (skip or 0) + 1 while skip > 0: frame = self.core.frame_counter + self.framebuffer = Image(*self.core.desired_video_dimensions()) + self.core.set_video_buffer(self.framebuffer) self.core.run_frame() skip -= 1 while frame <= self.core.frame_counter and limit != 0: diff --git a/src/platform/python/cinema/test.py b/src/platform/python/cinema/test.py index dd47708f9..fdd333fd5 100644 --- a/src/platform/python/cinema/test.py +++ b/src/platform/python/cinema/test.py @@ -3,7 +3,6 @@ import os.path import mgba.core import mgba.image import cinema.movie -import itertools import glob import re from copy import deepcopy @@ -73,7 +72,7 @@ class VideoTest(CinemaTest): self.tracer = cinema.movie.Tracer(self.core) def generate_frames(self): - for i, frame in zip(itertools.count(), self.tracer.video(**self.output_settings())): + for i, frame in enumerate(self.tracer.video(**self.output_settings())): try: baseline = VideoFrame.load(os.path.join(self.path, self.BASELINE % i)) yield baseline, frame, VideoFrame.diff(baseline, frame) @@ -85,7 +84,7 @@ class VideoTest(CinemaTest): assert not any(any(diffs[0].image.convert("L").point(bool).getdata()) for diffs in self.diffs) def generate_baseline(self): - for i, frame in zip(itertools.count(), self.tracer.video(**self.output_settings())): + for i, frame in enumerate(self.tracer.video(**self.output_settings())): frame.save(os.path.join(self.path, self.BASELINE % i))