1580158
/
infinite-zoom-automatic1111-webui
mirror of https://github.com/v8hid/infinite-zoom-automatic1111-webui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix reverse issue in interpolateFramesSmallCenter

exit_image
Charles Fettinger 2023-05-26 03:36:40 -07:00
parent c7fb60e38d
commit 3872c3713c
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
iz_helpers/run.py
View File

@ -128,12 +128,12 @@ class InfZoomer:
if (self.C.upscale_do):
self.doUpscaling()
if self.C.video_zoom_mode:
self.main_frames = self.main_frames[::-1]
self.start_frames_temp = self.start_frames[::-1]
self.start_frames = self.end_frames[::-1]
self.end_frames = self.start_frames_temp
self.start_frames_temp = None
#if self.C.video_zoom_mode:
# self.main_frames = self.main_frames[::-1]
# self.start_frames_temp = self.start_frames[::-1]
# self.start_frames = self.end_frames[::-1]
# self.end_frames = self.start_frames_temp
# self.start_frames_temp = None
if not self.outerZoom:
self.contVW = ContinuousVideoWriter(
@ -451,7 +451,7 @@ class InfZoomer:
#else:
# prev_image_gradient_ratio = (self.C.blend_gradient_size / 100)
# prev_image_amask = draw_gradient_ellipse(prev_image.width, prev_image.height, prev_image_gradient_ratio, 0.0, 2.5)
prev_image_amask = self.getAlphaMask(prev_image,i, True)
prev_image_amask = self.getAlphaMask(prev_image,i, False)
#prev_image = apply_alpha_mask(prev_image, prev_image_amask, invert = True)
# merge previous image with current image
@ -486,11 +486,11 @@ class InfZoomer:
def interpolateFramesOuterZoom(self):
#frames reversed prior to interpolation
#frames reversed and sorted prior to interpolation
#if 0 == self.C.video_zoom_mode:
current_image = self.main_frames[0]
next_image = self.main_frames[1]
current_image = self.start_frames[0]
next_image = self.start_frames[1]
#elif 1 == self.C.video_zoom_mode:
# current_image = self.main_frames[-1]
# next_image = self.main_frames[-2]
@ -548,7 +548,7 @@ class InfZoomer:
lastFrame = cropped_image_pil
# process last frames
lastFrame = self.end_frames[-1]
lastFrame = self.end_frames[1]
nextToLastFrame = self.end_frames[0]
self.contVW.finish(lastFrame,
@ -582,7 +582,10 @@ class InfZoomer:
"""
def interpolateFramesSmallCenter(self):
#frames reversed prior to interpolation
#frames reversed and resorted prior to interpolation
if self.C.video_zoom_mode:
self.C.video_ffmpeg_opts += "-vf reverse"
# note -vf lutyuv=u='(val-maxval/2)*2+maxval/2':v='(val-maxval/2)*2+maxval/2' worked in video tab
self.contVW = ContinuousVideoWriter(self.out_config["video_filename"],
self.start_frames[0],#(self.width,self.height)),
@ -663,6 +666,10 @@ class InfZoomer:
self.C.blend_gradient_size,
hex_to_rgba(self.C.blend_color))
#if self.C.video_zoom_mode:
# result = self.contVW.reverse_frames()
# print(f"reverse result: {result.stdout.decode}")
def prepare_output_path(self):
isCollect = shared.opts.data.get("infzoom_collectAllResources", False)
@ -726,14 +733,14 @@ class InfZoomer:
mask_width = self.mask_width
mask_height = self.mask_height
# set minimum mask size to 12.5% of the image size
if mask_width < self.width / 8:
mask_width = self.width / 8
mask_height = self.height / 8
if mask_width < self.width // 8:
mask_width = self.width // 8
mask_height = self.height // 8
print(f"\033[93m{self.mask_width}x{self.mask_height} set - used: {mask_width}x{mask_height} Correct in Outpaint pixels settings")
# set maximum mask size to 50% of the image size
if mask_width > self.width / 2:
mask_width = self.width / 2
mask_height = self.height / 2
# set maximum mask size to 75% of the image size
if mask_width > (self.width // 4) * 3:
mask_width = (self.width // 4) * 3
mask_height = (self.height // 4) * 3
print(f"\033[93m{self.mask_width}x{self.mask_height} set - used: {mask_width}x{mask_height} Correct in Outpaint pixels settings")
self.mask_width = int(mask_width)
self.mask_height = int(mask_height)

23
iz_helpers/video.py
View File

@ -73,6 +73,7 @@ def write_video(file_path, frames, fps, reversed=True, start_frame_dupe_amount=1
class ContinuousVideoWriter:
_writer = None
_file_path = None
def __init__(self, file_path, initframe, nextframe, fps, start_frame_dupe_amount=15, video_ffmpeg_opts="", blend_invert: bool = False, blend_image= None, blend_type:int = 0, blend_gradient_size: int = 63, blend_color = "#ffff00" ):
"""
@ -82,6 +83,7 @@ class ContinuousVideoWriter:
:param fps: Desired frame rate
:param reversed: if order of images to be reversed (default = True)
"""
self._file_path = file_path
ffopts = []
if video_ffmpeg_opts is not "":
ffopts= video_ffmpeg_opts.split(" ")
@ -130,13 +132,28 @@ class ContinuousVideoWriter:
self._writer.append_data(np.array(f.convert("RGB")))
self._writer.close()
def reverse_frames(self):
"""
Reverses the video
"""
results = reverse_video(self._file_path, self._file_path)
def add_audio_to_video(video_path, audio_path, output_path, ffmpeg_location = 'ffmpeg'):
# Construct the FFmpeg command
command = [ffmpeg_location, '-i', video_path, '-i', audio_path, '-c:v', 'copy', '-c:a', 'aac', '-map', '0:v:0', '-map', '1:a:0', '-shortest', output_path]
subprocess.run(command)
return output_path
def resize_video(input_path, output_path, width:int, height:int, flags:str="lanczos"):
def resize_video(input_path, output_path, width:int, height:int, flags:str="lanczos", ffmpeg_location = 'ffmpeg'):
scaling = f'{width}:{height}'
command = ['ffmpeg', '-i', input_path, '-vf', f'scale={scaling}:flags={flags}', output_path]
# Construct the FFmpeg command
command = [ffmpeg_location, '-i', input_path, '-vf', f'scale={scaling}:flags={flags}', output_path]
subprocess.run(command)
return output_path
return output_path
def reverse_video(input_path, output_path, ffmpeg_location = 'ffmpeg'):
# Construct the FFmpeg command
command = [ffmpeg_location, '-i', input_path, '-vf', 'reverse', output_path]
# Execute the FFmpeg command
return subprocess.run(command, capture_output=True)