fix yt-dlp

hls_download.py

@@ -1,39 +1,29 @@
-import yt_dlp
-import os
 import subprocess
+import os
 
 def download_clips(stream_url, out_dir, start_time, end_time, resize=True):
     output_file = os.path.join(out_dir, f"train_{len(os.listdir(out_dir))}.mp4")
-    
-    # Calculate the duration we want to download
-    duration = end_time - start_time + 4  # Add 4 seconds for 2 second padding on each side
-
-    # Configure yt-dlp options
-    ydl_opts = {
-        'format': 'best',
-        'outtmpl': os.path.join(out_dir, 'temp_download.%(ext)s'),
-        'nocheckcertificate': True,
-        'no_warnings': True,
-        'external_downloader': 'ffmpeg',
-        'external_downloader_args': [
-            'ffmpeg_i:', 
-            f'-ss {max(0, start_time - 2)}',
-            '-t', f'{duration}'
-        ],
-    }
+    tmp_file = os.path.join(out_dir, f"train_{len(os.listdir(out_dir))}_tmp.mp4")
+    yt_dlp_cmd = [
+        'yt-dlp',
+        '--download-sections', f'*{start_time}-{end_time}',
+        stream_url,
+        '-o', tmp_file
+    ]
 
+    print(' '.join(yt_dlp_cmd))
+    
     try:
-        # Download the specific portion of the video
-        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
-            info = ydl.extract_info(stream_url, download=True)
-            downloaded_file = ydl.prepare_filename(info)
-
-        # Use FFmpeg to process the downloaded file if resizing is needed
-        if resize:
-            processed_file = os.path.join(out_dir, 'temp_processed.mp4')
-            ffmpeg_cmd = [
+        subprocess.run(yt_dlp_cmd, check=True, capture_output=True, text=True)
+    except subprocess.CalledProcessError as e:
+        print(f"Error occurred: {e}")
+        print(f"yt-dlp output: {e.output}")
+        return None
+    
+    if resize:
+        ffmpeg_cmd = [
                 'ffmpeg',
-                '-i', downloaded_file,
+                '-i', tmp_file,
                 '-c:v', 'libx264',
                 '-preset', 'veryfast',
                 '-crf', '23',
@@ -43,17 +33,15 @@ def download_clips(stream_url, out_dir, start_time, end_time, resize=True):
                 '-c:a', 'aac',
                 '-b:a', '128k',
                 '-y',
-                processed_file
+                output_file
             ]
-
+        try:
             subprocess.run(ffmpeg_cmd, check=True, capture_output=True, text=True)
-            os.remove(downloaded_file)
-            os.rename(processed_file, output_file)
-        else:
-            os.rename(downloaded_file, output_file)
-
-        return output_file
+        except subprocess.CalledProcessError as e:
+            print(f"Error occurred: {e}")
+            print(f"ffmpeg output: {e.output}")
+            return None
+    else:
+        os.rename(tmp_file, output_file)
 
-    except Exception as e:
-        print(f"An error occurred: {e}")
-        return None
+    return output_file