Update app.py

app.py

@@ -7,6 +7,7 @@ from gradio import components
 import tempfile
 from pathlib import Path
 from gradio import inputs, outputs
+from moviepy.editor import VideoFileClip
 
 # Define File object
 File = Path
@@ -16,7 +17,10 @@ temp_dir = tempfile.mkdtemp()
 
 video_file = gr.inputs.File(label="Video File", type="file")
 quality = gr.inputs.Dropdown(choices=["18", "23", "28", "32"], label="Quality", default="23")
+
+# default will now be None, which will retain original aspect ratio
 aspect_ratio = gr.inputs.Dropdown(choices=[
+  None,  # Add None option to retain original aspect ratio
   "1:1",
   "4:3",
   "3:2",
@@ -32,7 +36,7 @@ aspect_ratio = gr.inputs.Dropdown(choices=[
   "2:1",
   "1:2",
   "9:1",
-], label="Aspect Ratio", default="16:9")
+], label="Aspect Ratio", default=None) 
 
 video_url = gr.inputs.Textbox(label="Video URL")
 
@@ -48,7 +52,7 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
         input_path = video_file.name
     
     # If a URL was provided
-    elif video_url is not None:
+    elif video_url:
         # Get the file name from URL
         file_name = video_url.split("/")[-1]
 
@@ -62,7 +66,7 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
         response = requests.get(video_url)
         
         if response.status_code == 200:
-            input_path = os.path.join(temp_dir, output_file_name)
+            input_path = os.path.join(temp_dir, file_name)
             with open(input_path, 'wb') as f:
                 f.write(response.content)
         else:
@@ -81,13 +85,17 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
         return output_path
     else:
         # The file does not exist, so we need to convert it
-        ffmpeg_command = f"ffmpeg -i {input_path} -c:v libx264 -crf {quality} -vf scale=-1:720,setsar=1:1 -hls_time 6 -hls_playlist_type vod -f hls {output_path}"
+        if aspect_ratio is None:
+            video = VideoFileClip(input_path)
+            aspect_ratio = f"{video.size[0]}:{video.size[1]}"
+        
+        ffmpeg_command = f"ffmpeg -i {input_path} -c:v libx264 -crf {quality} -vf scale=-1:720,setsar={aspect_ratio} -hls_time 6 -hls_playlist_type vod -f hls {output_path}"
 
         try:
-            subprocess.run(ffmpeg_command, shell=True, timeout=10)
+            subprocess.run(ffmpeg_command, shell=True, timeout=600)
         except subprocess.TimeoutExpired:
             print("ffmpeg timed out")
-            return "ffmpeg timed out"
+            return "ffmpeg command timed out."
         except FileNotFoundError:
             print("ffmpeg is not installed.")
             return "ffmpeg is not installed."
@@ -101,6 +109,4 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
         # The file has now been converted, so we can display it in the output viewer
         return output_path
 
-
-
 gr.Interface(convert_video, inputs=[video_file, quality, aspect_ratio, video_url], outputs='file').launch()