Actualizar nodo OmniVision

ffmpeg.py

@@ -269,20 +269,33 @@ def normalize_thumbnail_image(src_path: str, dst_path: str) -> bool:
         return False
 
 
-def compress_with_cmd(
+def is_subtitle_or_mux_error(err_str: str) -> bool:
+    """Comprueba si el error de stderr de FFmpeg está relacionado con subtítulos corruptos o fallos de muxing."""
+    lower = err_str.lower()
+    indicators = [
+        "application provided duration",
+        "mov_text",
+        "subtitle",
+        "av_interleaved_write_frame",
+        "invalid argument",
+        "error while writing stream",
+        "pts has no value",
+        "out of range for mov/mp4",
+        "invalid dts",
+        "invalid pts",
+        "muxing",
+    ]
+    return any(ind in lower for ind in indicators)
+
+
+def build_compress_args(
     input_path: str,
     output_path: str,
     settings: Dict[str, Any],
     wm_image_path: str,
-    total_duration: float,
-    on_cmd: Optional[Callable[[subprocess.Popen], None]] = None,
-    on_progress: Optional[Callable[[Dict[str, Any]], None]] = None,
-    is_cancelled: Optional[Callable[[], bool]] = None,
-) -> None:
-    """
-    Ejecuta la compresión con FFmpeg reportando el progreso en vivo.
-    Implementa el escaneo exacto de CRLF y CR de FFmpeg.
-    """
+    include_subtitles: bool = True,
+) -> Tuple[List[str], bool]:
+    """Genera la lista de argumentos para FFmpeg, permitiendo habilitar o deshabilitar subtítulos."""
     settings = sanitize_settings(settings)
 
     args = ["-y", "-i", input_path]
@@ -315,13 +328,15 @@ def compress_with_cmd(
 
     is_avi = settings.get("format", "").lower() == "avi" or output_path.lower().endswith(".avi")
 
+    has_subtitles = False
     # Subtítulos de texto para contenedores no AVI
-    if not is_avi:
+    if not is_avi and include_subtitles:
         text_sub_streams = get_text_subtitle_streams(input_path)
         for idx in text_sub_streams:
             args.extend(["-map", f"0:{idx}"])
         if text_sub_streams:
             args.extend(["-c:s", "mov_text"])
+            has_subtitles = True
 
     codec = settings.get("codec") or "libx264"
     args.extend(["-c:v", codec])
@@ -354,7 +369,16 @@ def compress_with_cmd(
         args.extend(["-movflags", "+faststart"])
 
     args.extend(["-threads", "0", output_path])
+    return args, has_subtitles
+
 
+def execute_ffmpeg_cmd(
+    args: List[str],
+    total_duration: float,
+    on_cmd: Optional[Callable[[subprocess.Popen], None]] = None,
+    on_progress: Optional[Callable[[Dict[str, Any]], None]] = None,
+    is_cancelled: Optional[Callable[[], bool]] = None,
+) -> None:
     cmd_list = ["ffmpeg"] + args
 
     proc = subprocess.Popen(
@@ -451,3 +475,39 @@ def compress_with_cmd(
                 proc.kill()
             except Exception:
                 pass
+
+
+def compress_with_cmd(
+    input_path: str,
+    output_path: str,
+    settings: Dict[str, Any],
+    wm_image_path: str,
+    total_duration: float,
+    on_cmd: Optional[Callable[[subprocess.Popen], None]] = None,
+    on_progress: Optional[Callable[[Dict[str, Any]], None]] = None,
+    is_cancelled: Optional[Callable[[], bool]] = None,
+) -> None:
+    """
+    Ejecuta la compresión con FFmpeg reportando el progreso en vivo.
+    Si la compresión falla debido a subtítulos corruptos o timestamps inválidos,
+    reintenta automáticamente descartando los subtítulos para no fallar la tarea.
+    """
+    args, has_subtitles = build_compress_args(input_path, output_path, settings, wm_image_path, include_subtitles=True)
+    try:
+        execute_ffmpeg_cmd(args, total_duration, on_cmd, on_progress, is_cancelled)
+        return
+    except RuntimeError as e:
+        if is_cancelled and is_cancelled():
+            raise
+        if has_subtitles and is_subtitle_or_mux_error(str(e)):
+            logger.warning(f"[ffmpeg] Falló compresión con subtítulos ({e}). Reintentando sin subtítulos...")
+            if os.path.isfile(output_path):
+                try:
+                    os.remove(output_path)
+                except Exception:
+                    pass
+            retry_args, _ = build_compress_args(input_path, output_path, settings, wm_image_path, include_subtitles=False)
+            execute_ffmpeg_cmd(retry_args, total_duration, on_cmd, on_progress, is_cancelled)
+            logger.info("[ffmpeg] Compresión completada con éxito tras descartar subtítulos corruptos.")
+            return
+        raise