Add track mark on process restart in `input.external.{rawaudio,rawvid…

…eo}. Fixes: #2872
savonet · Jan 31, 2023 · c3cfb52 · c3cfb52
1 parent 4e3e281
commit c3cfb52
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/core/sources/external_input_audio.ml b/src/core/sources/external_input_audio.ml
@@ -43,12 +43,13 @@ class external_input ~name ~restart ~bufferize ~restart_on_error ~max ~converter
         (Frame.seconds_of_audio (buffered + length - (3 * abg_max_len / 4)))
     else `Continue
   in
-  object
+  object (self)
     inherit
       External_input.base
         ~name ?read_header ~restart ~restart_on_error ~on_data command
 
     inherit Generated.source ~empty_on_abort:false ~bufferize ()
+    method on_stop = Generator.add_track_mark self#buffer
   end
 
 let proto =

diff --git a/src/core/sources/external_input_video.ml b/src/core/sources/external_input_video.ml
@@ -37,12 +37,13 @@ class video ~name ~restart ~bufferize ~restart_on_error ~max ~on_data
       `Delay (Frame.seconds_of_audio (buffered - (3 * abg_max_len / 4)))
     else `Continue
   in
-  object
+  object (self)
     inherit
       External_input.base
         ~name ?read_header ~restart ~restart_on_error ~on_data command
 
     inherit Generated.source ~empty_on_abort:false ~bufferize ()
+    method on_stop = Generator.add_track_mark self#buffer
   end
 
 (***** AVI *****)

diff --git a/src/core/tools/external_input.ml b/src/core/tools/external_input.ml
@@ -38,6 +38,7 @@ class virtual base ~name ~restart ~restart_on_error ~on_data ?read_header
     (** The header was already read. *)
     val mutable header_read = false
 
+    method virtual on_stop : unit
     method stype = `Fallible
 
     method! wake_up _ =
@@ -57,6 +58,7 @@ class virtual base ~name ~restart ~restart_on_error ~on_data ?read_header
           `Continue
       in
       let on_stop status =
+        self#on_stop;
         header_read <- false;
         match status with
           | `Status (Unix.WEXITED 0) -> restart