Explicit signal of end of process in external encoder. Fixes: #3029

savonet · Apr 26, 2023 · 765c427 · 765c427
1 parent 4ea8e96
commit 765c427
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,7 @@
 Fixed:
 * Fixed non-monotonous PTS in ffmpeg raw content (#2978)
 * Fixed external encoder (#3020)
+* Fixed deadlock in `%external` encoder (#3029)
 
 2.1.4 (2022-03-01)
 =====

diff --git a/src/encoder/external_encoder.ml b/src/encoder/external_encoder.ml
@@ -84,6 +84,12 @@ let encoder id ext =
         log#important "Error: %s" (Printexc.to_string e);
         restart_decision ()
   in
+  (* Signal end of process instead of always waiting
+     for zero read. See: https://lkml.indiana.edu/hypermail/linux/kernel/0106.0/0768.html *)
+  let on_stop v =
+    Condition.signal condition;
+    v
+  in
   let log s = log#important "%s" s in
   let on_stdout =
     Tutils.mutexify mutex (fun puller ->