Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
"cffi",
"cfgv",
"charliermarsh",
"chunksize",
"cimport",
"cimports",
"clibase",
Expand Down
15 changes: 8 additions & 7 deletions src/tranzoom/cli/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,7 @@ def _SmartImage(i: int) -> image.Image:
try:

def _TwoFrameRenderStream() -> abc.Iterator[
tuple[zoom.RenderedZoomFrame, zoom.RenderedZoomFrame | None]
tuple[pixels.RenderedZoomFrame, pixels.RenderedZoomFrame | None]
]:
"""Render base frames with a rolling [curr, next] window.

Expand All @@ -1589,27 +1589,27 @@ def _TwoFrameRenderStream() -> abc.Iterator[
(frameN-1, None)

Yields:
tuple[zoom.RenderedZoomFrame, zoom.RenderedZoomFrame | None]: A tuple of
tuple[pixels.RenderedZoomFrame, pixels.RenderedZoomFrame | None]: A tuple of
the current frame and the next frame (or None if at the end)

"""
curr_frame: zoom.RenderedZoomFrame = _StreamingRenderFrame(0)
next_frame: zoom.RenderedZoomFrame | None = _StreamingRenderFrame(1) # (MIN_FRAMES is 3)
curr_frame: pixels.RenderedZoomFrame = _StreamingRenderFrame(0)
next_frame: pixels.RenderedZoomFrame | None = _StreamingRenderFrame(1) # (MIN_FRAMES=3)
for i in range(zoom_params.n_frames):
yield (curr_frame, next_frame)
if next_frame is None:
break
curr_frame = next_frame
next_frame = _StreamingRenderFrame(i + 2) if i + 2 < zoom_params.n_frames else None

def _StreamingRenderFrame(i: int) -> zoom.RenderedZoomFrame:
def _StreamingRenderFrame(i: int) -> pixels.RenderedZoomFrame:
"""Render a single frame, returning the image data. Only one in memory at a time.

Args:
i (int): The index of the frame in the zoom sequence.

Returns:
zoom.RenderedZoomFrame: The rendered image data for the frame at index i.
pixels.RenderedZoomFrame: The rendered image data for the frame at index i.

"""
# render the frame, get the image data and hash
Expand Down Expand Up @@ -1642,7 +1642,7 @@ def _StreamingRenderFrame(i: int) -> zoom.RenderedZoomFrame:
# update progress bar, return data
if p_bar:
p_bar.update(1)
return zoom.RenderedZoomFrame(
return pixels.RenderedZoomFrame(
idx=i, data=img_data, data_hash=data_hash, img_path=img_path
)

Expand Down Expand Up @@ -1701,6 +1701,7 @@ def _StreamingRenderFrame(i: int) -> zoom.RenderedZoomFrame:
i_frames=zoom_params.render.i_frames,
zoom_per_step=float(zoom_params.scalar_magnification_per_step),
use_quadratic=zoom.DEFAULT_USE_QUADRATIC,
max_threads=config.max_threads,
)
if zoom_params.render.anim == pixels.AnimationEncoding.GIF:
zoom.WriteAnimatedGIF(
Expand Down
4 changes: 2 additions & 2 deletions src/tranzoom/core/fractal.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ def ComputeFractal(
if params.frm.fractal == frame.Fractal.MANDELBROT
else PY_JULIA_COMPUTATION
)
# log the start of the render (not pre-computation anymore here)
# log the start of the actual computation (not pre-computation anymore here)
logging.info(
f'{params.frm.fractal.value.upper()} using {n_processes} process(es) '
f'for {"PRE " if is_preprocess else ""}rendering - {actual_opt_msg}'
f'for {"PRE " if is_preprocess else ""}computation - {actual_opt_msg}'
)
# create inputs
inp: list[image.FractalTaskInput] = [
Expand Down
Loading