Skip to content

add step to frame reader #27

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

Open
gabrielealbertini wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add step to frame reader #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions pycine/raw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ def frame_reader(
header: Header,
start_frame: int = 1,
count: int = None,
step: int = 1,
) -> Generator[np.ndarray, Any, None]:
frame = start_frame
if not count:
count = header["cinefileheader"].ImageCount

with open(cine_file, "rb") as f:
while count:
while count // step:
frame_index = frame - 1
logger.debug(f"Reading frame {frame}")

Expand All @@ -40,8 +41,8 @@ def frame_reader(
raw_image = create_raw_array(data, header)

yield raw_image
frame += 1
count -= 1
frame += step
count -= step


def read_bpp(header):
Expand All @@ -67,7 +68,7 @@ def read_bpp(header):


def image_generator(
cine_file: Union[str, bytes, PathLike], start_frame: int = None, start_frame_cine: int = None, count: int = None
cine_file: Union[str, bytes, PathLike], start_frame: int = None, start_frame_cine: int = None, count: int = None, step: int =1
) -> Generator[np.ndarray, Any, None]:
"""
Get only a generator of raw images for specified cine file.
Expand Down Expand Up @@ -109,12 +110,12 @@ def image_generator(
raise ValueError(
f"Cannot read frame {start_frame_cine:d}. This cine has only from {first_image_number:d} to {last_image_number:d}."
)
raw_image_generator = frame_reader(cine_file, header, start_frame=fetch_head, count=count)
raw_image_generator = frame_reader(cine_file, header, start_frame=fetch_head, count=count, step=step)
return raw_image_generator


def read_frames(
cine_file: Union[str, bytes, PathLike], start_frame: int = None, start_frame_cine: int = None, count: int = None
cine_file: Union[str, bytes, PathLike], start_frame: int = None, start_frame_cine: int = None, count: int = None, step: int = 1
) -> Tuple[Generator[np.ndarray, Any, None], SETUP, int]:
"""
Get a generator of raw images for specified cine file.
Expand Down Expand Up @@ -148,7 +149,7 @@ def read_frames(
header = read_header(cine_file)
bpp = read_bpp(header)
setup = header["setup"]
raw_image_generator = image_generator(cine_file, start_frame, start_frame_cine, count)
raw_image_generator = image_generator(cine_file, start_frame, start_frame_cine, count, step)
return raw_image_generator, setup, bpp


Expand Down