Update app.py

app.py

@@ -60,25 +60,27 @@ def upload_to_web3_storage(api_key, path):
         logging.exception("An error occurred while uploading to web3.storage.")
         return f"An error occurred while uploading to web3.storage: {response.json()}"
 
-def convert_video(video_file, quality, aspect_ratio, video_url, api_key, upload, resolution):
+def convert_video(video_file, quality, aspect_ratio, video_url, api_key, upload):
+    standard_resolutions = [4320, 2160, 1440, 1080, 720, 480]  # 8K, 4K, 2K, Full HD, HD, SD in pixels
+
     with tempfile.TemporaryDirectory() as temp_dir:
         temp_dir = Path(temp_dir)
         input_path = get_input_path(video_file, video_url, temp_dir)
 
         aspect_ratio = get_aspect_ratio(input_path, aspect_ratio)
 
-        # Check if resolution is a list, if not convert it to a list
-        resolution = [resolution] if not isinstance(resolution, list) else resolution
+        video = VideoFileClip(str(input_path))
+        original_height = video.size[1]
 
         output_paths = []  # Define output_paths as an empty list
 
-        for res in resolution:
-            # Skip if res is boolean
-            if isinstance(res, bool):
+        for res in standard_resolutions:
+            # Skip if resolution is higher than original
+            if res > original_height:
                 continue
 
-            scale = "-1:" + str(res.replace("p", ""))  # we convert '1080p' to '-1:1080'
-            output_path = get_output_path(input_path, temp_dir, res)  # pass the resolution to create a unique output file
+            scale = "-1:" + str(res)  # we scale the height to res and keep aspect ratio
+            output_path = get_output_path(input_path, temp_dir, str(res) + 'p')  # pass the resolution to create a unique output file
 
             ffmpeg_command = [
                 "ffmpeg", "-i", str(input_path), "-c:v", "libx264", "-crf", str(quality),
@@ -86,12 +88,29 @@ def convert_video(video_file, quality, aspect_ratio, video_url, api_key, upload,
                 "-hls_playlist_type", "vod", "-f", "hls", str(output_path)
             ]
 
-            # Rest of the function...
+            try:
+                logging.info("Running command: %s", " ".join(ffmpeg_command))
+                subprocess.run(ffmpeg_command, check=True, timeout=600)
+            except subprocess.CalledProcessError:
+                logging.exception("ffmpeg command failed.")
+                error_file_path = tempfile.gettempdir() + "/error.txt"
+                with open(error_file_path, 'w') as error_file:
+                    error_file.write("ffmpeg command failed.")
+                return error_file_path
+            except subprocess.TimeoutExpired:
+                logging.exception("ffmpeg command timed out.")
+                return "ffmpeg command timed out."
+            except FileNotFoundError:
+                logging.exception("ffmpeg is not installed.")
+                return "ffmpeg is not installed."
+            except Exception as e:
+                logging.exception("An error occurred.")
+                return f"An error occurred: {str(e)}"
 
             output_paths.append(output_path)  # Append the output_path to output_paths
 
         if not output_paths:
-            return "No resolution was selected."
+            return "The video is smaller than the smallest standard resolution."
 
         output_copy_paths = [shutil.copy2(path, tempfile.gettempdir()) for path in output_paths]
 
@@ -100,17 +119,18 @@ def convert_video(video_file, quality, aspect_ratio, video_url, api_key, upload,
     else:
         return output_copy_paths
 
+
 def main():
     video_file = gr.inputs.File(label="Video File")
     quality = gr.inputs.Dropdown(
         choices=["18", "23", "27", "28", "32"], label="Quality", default="27")
     aspect_ratio = gr.inputs.Dropdown(
-        choices=[None, "1:1", "4:3", "3:2", "5:4", "16:9", "21:9", 
+        choices=["16:9",  "1:1", "4:3", "3:2", "5:4", "21:9", 
                  "1.85:1", "2.35:1", "3:1", "360", "9:16", "16:9", 
                  "2:1", "1:2", "9:1"], 
         label="Aspect Ratio", default="16:9") 
-    resolution = gr.components.Dropdown(
-    choices=["480p", "720p", "1080p", "1440p", "2160p", "4320p"], label="Resolution", multiple=True, default="1080p")
+    # resolution = gr.components.Dropdown(
+    # choices=["480p", "720p", "1080p", "1440p", "2160p", "4320p"], label="Resolution", default="1080p")
     video_url = gr.inputs.Textbox(label="Video URL")
     api_key = gr.inputs.Textbox(label="web3.storage API Key")
     upload = gr.inputs.Checkbox(label="Upload to web3.storage", default=False)