Allow the user to choose the video size (#39)

- Allow the user to choose the video size (3ca67e5806fff9172bd3a4bda21566c7197e695e)


Co-authored-by: Fabrice TIERCELIN <[email protected]>

app.py

@@ -45,7 +45,12 @@ def animate(
     height: int = 576
 ):
     start = time.time()
+
+    if image is None:
+        raise gr.Error("Please provide an image to animate.")
+
     output_folder = "outputs"
+    image = resize_image(image, output_size=(width, height))
     if image.mode == "RGBA":
         image = image.convert("RGB")
         
@@ -98,7 +103,7 @@ def animate(
     
     return [
         # Display for video
-        gr.update(value = video_path, visible=video_format != "gif"),
+        gr.update(value = video_path, visible = video_format != "gif"),
         # Display for gif
         gr.update(value = gif_path, visible = video_format == "gif"),
         # Download button
@@ -137,14 +142,14 @@ def animate_on_gpu(
 
 
 def resize_image(image, output_size=(1024, 576)):
-    # Calculate aspect ratios
-    target_aspect = output_size[0] / output_size[1]  # Aspect ratio of the desired size
-    image_aspect = image.width / image.height  # Aspect ratio of the original image
-
     # Do not touch the image if the size is good
     if image.width == output_size[0] and image.height == output_size[1]:
         return image
 
+    # Calculate aspect ratios
+    target_aspect = output_size[0] / output_size[1]  # Aspect ratio of the desired size
+    image_aspect = image.width / image.height  # Aspect ratio of the original image
+
     # Resize if the original image is larger
     if image_aspect > target_aspect:
         # Resize the image to match the target height, maintaining aspect ratio
@@ -181,7 +186,9 @@ def reset():
         3,
         "mp4",
         "webp",
-        "auto"
+        "auto",
+        1024,
+        576
     ]
 
 with gr.Blocks() as demo:
@@ -201,6 +208,8 @@ with gr.Blocks() as demo:
       with gr.Column():
           image = gr.Image(label="Upload your image", type="pil")
           with gr.Accordion("Advanced options", open=False):
+              width = gr.Slider(label="Width", info="Width of the video", value=1024, minimum=256, maximum=1024, step=8)
+              height = gr.Slider(label="Height", info="Height of the video", value=576, minimum=256, maximum=576, step=8)
               fps_id = gr.Slider(label="Frames per second", info="The length of your video in seconds will be 25/fps", value=25, minimum=5, maximum=30)
               motion_bucket_id = gr.Slider(label="Motion bucket id", info="Controls how much motion to add/remove from the image", value=127, minimum=1, maximum=255)
               noise_aug_strength = gr.Slider(label="Noise strength", info="The noise to add", value=0.1, minimum=0, maximum=1, step=0.1)
@@ -215,13 +224,12 @@ with gr.Blocks() as demo:
           reset_btn = gr.Button(value="🧹 Reinit page", variant="stop", elem_id="reset_button", visible = False)
 
       with gr.Column():
-          video_output = gr.Video(label="Generated video", format="mp4", autoplay=True)
-          gif_output = gr.Image(label="Generated video", format="gif", visible=False)
+          video_output = gr.Video(label="Generated video", format="mp4", autoplay=True, show_download_button=False)
+          gif_output = gr.Image(label="Generated video", format="gif", show_download_button=False, visible=False)
           download_button = gr.DownloadButton(label="💾 Download video", visible=False)
           information_msg = gr.HTML(visible=False)
           gallery = gr.Gallery(label="Generated frames", visible=False)
       
-  image.upload(fn=resize_image, inputs=image, outputs=image, queue=False)
   generate_btn.click(fn=animate, inputs=[
       image,
       seed,
@@ -232,7 +240,9 @@ with gr.Blocks() as demo:
       decoding_t,
       video_format,
       frame_format,
-      version
+      version,
+      width,
+      height
   ], outputs=[
       video_output,
       gif_output,
@@ -253,16 +263,18 @@ with gr.Blocks() as demo:
       decoding_t,
       video_format,
       frame_format,
-      version
+      version,
+      width,
+      height
   ], queue = False, show_progress = False)
     
   gr.Examples(
     examples=[
-        ["Examples/Fire.webp", 42, True, 127, 25, 0.1, 3, "mp4", "png", "auto"],
-        ["Examples/Water.png", 42, True, 127, 25, 0.1, 3, "mp4", "png", "auto"],
-        ["Examples/Town.jpeg", 42, True, 127, 25, 0.1, 3, "mp4", "png", "auto"]
+        ["Examples/Fire.webp", 42, True, 127, 25, 0.1, 3, "mp4", "png", "auto", 1024, 576],
+        ["Examples/Water.png", 42, True, 127, 25, 0.1, 3, "mp4", "png", "auto", 1024, 576],
+        ["Examples/Town.jpeg", 42, True, 127, 25, 0.1, 3, "mp4", "png", "auto", 1024, 576]
     ],
-    inputs=[image, seed, randomize_seed, motion_bucket_id, fps_id, noise_aug_strength, decoding_t, video_format, frame_format, version],
+    inputs=[image, seed, randomize_seed, motion_bucket_id, fps_id, noise_aug_strength, decoding_t, video_format, frame_format, version, width, height],
     outputs=[video_output, gif_output, download_button, gallery, seed, information_msg, reset_btn],
     fn=animate,
     run_on_click=True,