Skip to content

Optimize calculation of extended shift #132

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

Merged
vladtcvs merged 1 commit into from
Sep 1, 2024
Merged

Optimize calculation of extended shift #132

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
84 changes: 50 additions & 34 deletions src/vstarstack/tool/shift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,31 @@ def apply_shift(project: vstarstack.tool.cfg.Project, argv: list[str]):
with mp.Pool(ncpu) as pool:
pool.starmap(_make_shift_same_size, args)

def _find_shifted_corners(arg):
filename, name, shifts = arg
print(f"Estimating size of {name}")
df = vstarstack.library.data.DataFrame.load(filename)
input_proj_type, input_proj_desc = vstarstack.library.projection.tools.extract_description(df)
if input_proj_type != ProjectionType.Perspective:
print("Invalid projection type: ", input_proj_type)
return (None, None, None, None, None, None, None)

w = df.get_parameter("w")
h = df.get_parameter("h")
input_proj = vstarstack.library.projection.tools.build_projection(ProjectionType.Perspective, input_proj_desc, (h, w))

out_proj_desc = input_proj_desc

points = np.array([(0,0),(w,0),(0,h),(w,h)])
shift = shifts[name]
shifted_points = shift.apply(points.astype('double'), input_proj, input_proj)

min_x = min(shifted_points[:,0])
max_x = max(shifted_points[:,0])
min_y = min(shifted_points[:,1])
max_y = max(shifted_points[:,1])
return (min_x, min_y, max_x, max_y, w, h, out_proj_desc)

def _find_extended_perspective(images : list, shifts : dict):
margin_left = 0
margin_right = 0
Expand All @@ -126,44 +151,33 @@ def _find_extended_perspective(images : list, shifts : dict):

out_proj_desc = {}

for name, filename in images:

df = vstarstack.library.data.DataFrame.load(filename)
input_proj_type, input_proj_desc = vstarstack.library.projection.tools.extract_description(df)
if input_proj_type != ProjectionType.Perspective:
print("Invalid projection type: ", input_proj_type)
return None, None, None

w = df.get_parameter("w")
h = df.get_parameter("h")
input_proj = vstarstack.library.projection.tools.build_projection(ProjectionType.Perspective, input_proj_desc, (h, w))

out_proj_desc = input_proj_desc

points = np.array([(0,0),(w,0),(0,h),(w,h)])
print(name)
shift = shifts[name]
shifted_points = shift.apply(points.astype('double'), input_proj, input_proj)

min_x = min(shifted_points[:,0])
max_x = max(shifted_points[:,0])
min_y = min(shifted_points[:,1])
max_y = max(shifted_points[:,1])

if min_x < 0:
margin_left = max(margin_left, -min_x)
if min_y < 0:
margin_top = max(margin_top, -min_y)
if max_x > w:
margin_right = max(margin_right, max_x-w)
if max_y > h:
margin_bottom = max(margin_bottom, max_y-h)
max_w = 0
max_h = 0

args = [(filename, name, shifts) for name, filename in images]
with mp.Pool(vstarstack.tool.cfg.nthreads) as pool:
corners = pool.map(_find_shifted_corners, args)
for min_x, min_y, max_x, max_y, w, h, out_proj_desc in corners:
if min_x is None:
continue
if min_x < 0:
margin_left = max(margin_left, -min_x)
if min_y < 0:
margin_top = max(margin_top, -min_y)
if max_x > w:
margin_right = max(margin_right, max_x-w)
if max_y > h:
margin_bottom = max(margin_bottom, max_y-h)
if w > max_w:
max_w = w
if h > max_h:
max_h = h

margin_w = max(margin_left, margin_right)
margin_h = max(margin_top, margin_bottom)

W = w + 2*math.ceil(margin_w)
H = h + 2*math.ceil(margin_h)
W = max_w + 2*math.ceil(margin_w)
H = max_h + 2*math.ceil(margin_h)

out_shape = (H, W)

Expand All @@ -190,6 +204,8 @@ def apply_shift_extended(project: vstarstack.tool.cfg.Project, argv: list[str]):

output_shape, output_proj, output_proj_desc = _find_extended_perspective(images, shifts)

print(f"Resulting size: {output_shape[1]}x{output_shape[0]} ")

args = [(name,
filename,
shifts[name] if name in shifts else None,
Expand Down