mirror of
https://github.com/Wan-Video/Wan2.1.git
synced 2025-11-04 22:26:36 +00:00
pre-merge for exif support
This commit is contained in:
parent
b44229a529
commit
ec981450df
@ -1164,6 +1164,24 @@ def expand_slist(slist, num_inference_steps ):
|
|||||||
pos += inc
|
pos += inc
|
||||||
return new_slist
|
return new_slist
|
||||||
|
|
||||||
|
def convert_image(image):
|
||||||
|
from PIL import ExifTags
|
||||||
|
|
||||||
|
image = image.convert('RGB')
|
||||||
|
for orientation in ExifTags.TAGS.keys():
|
||||||
|
if ExifTags.TAGS[orientation]=='Orientation':
|
||||||
|
break
|
||||||
|
exif = image.getexif()
|
||||||
|
if not orientation in exif:
|
||||||
|
return image
|
||||||
|
if exif[orientation] == 3:
|
||||||
|
image=image.rotate(180, expand=True)
|
||||||
|
elif exif[orientation] == 6:
|
||||||
|
image=image.rotate(270, expand=True)
|
||||||
|
elif exif[orientation] == 8:
|
||||||
|
image=image.rotate(90, expand=True)
|
||||||
|
return image
|
||||||
|
|
||||||
def generate_video(
|
def generate_video(
|
||||||
task_id,
|
task_id,
|
||||||
prompt,
|
prompt,
|
||||||
@ -1214,9 +1232,6 @@ def generate_video(
|
|||||||
print(f"Model loaded")
|
print(f"Model loaded")
|
||||||
reload_needed= False
|
reload_needed= False
|
||||||
|
|
||||||
import numpy as np
|
|
||||||
import tempfile
|
|
||||||
|
|
||||||
if wan_model == None:
|
if wan_model == None:
|
||||||
raise gr.Error("Unable to generate a Video while a new configuration is being applied.")
|
raise gr.Error("Unable to generate a Video while a new configuration is being applied.")
|
||||||
if attention_mode == "auto":
|
if attention_mode == "auto":
|
||||||
@ -1413,8 +1428,8 @@ def generate_video(
|
|||||||
if image2video:
|
if image2video:
|
||||||
samples = wan_model.generate(
|
samples = wan_model.generate(
|
||||||
prompt,
|
prompt,
|
||||||
image_to_continue.convert('RGB'),
|
convert_image(image_to_continue),
|
||||||
image_to_end.convert('RGB') if image_to_end != None else None,
|
convert_image(image_to_end) if image_to_end != None else None,
|
||||||
frame_num=(video_length // 4)* 4 + 1,
|
frame_num=(video_length // 4)* 4 + 1,
|
||||||
max_area=MAX_AREA_CONFIGS[resolution],
|
max_area=MAX_AREA_CONFIGS[resolution],
|
||||||
shift=flow_shift,
|
shift=flow_shift,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user