Merge pull request #191 from jb-alvarado/master

turn of drawtext filter with zmq in validation thread

ffplayout-frontend

@@ -1 +1 @@
-Subproject commit a1b203ebcfa0b3d9109ac049d332c2a45ad19e70
+Subproject commit 5a7db18ebc3d5cc0b2d098b0631e498da264064c

lib/src/utils/json_validate.rs

@@ -55,9 +55,17 @@ fn check_media(
 
     node.add_filter(config, &Arc::new(Mutex::new(vec![])));
 
+    let mut filter = node.filter.unwrap_or_default();
+
+    if filter.len() > 1 {
+        filter[1] = filter[1]
+            .replace("realtime=speed=1", "null")
+            .replace("arealtime=speed=1", "snull")
+    }
+
     enc_cmd.append(&mut node.cmd.unwrap_or_default());
-    enc_cmd.append(&mut node.filter.unwrap_or_default());
+    enc_cmd.append(&mut filter);
-    enc_cmd.append(&mut vec_strings!["-t", "0.15", "-f", "null", "-"]);
+    enc_cmd.append(&mut vec_strings!["-t", "0.1", "-f", "null", "-"]);
 
     let mut enc_proc = match Command::new("ffmpeg")
         .args(enc_cmd.clone())
@@ -112,9 +120,15 @@ fn check_media(
 pub fn validate_playlist(
     playlist: JsonPlaylist,
     is_terminated: Arc<AtomicBool>,
-    config: PlayoutConfig,
+    mut config: PlayoutConfig,
 ) {
     let date = playlist.date;
+
+    if config.text.add_text && !config.text.text_from_filename {
+        // Turn of drawtext filter with zmq, because its port is needed by the decoder instance.
+        config.text.add_text = false;
+    }
+
     let mut length = config.playlist.length_sec.unwrap();
     let mut begin = config.playlist.start_sec.unwrap();
 

lib/src/utils/mod.rs

@@ -708,7 +708,8 @@ pub fn stderr_reader(
 
             if line.contains("Invalid argument")
                 || line.contains("Numerical result")
-                || line.contains("No such file or directory")
+                || (line.contains("No such file or directory")
+                    && !line.contains("failed to delete old segment"))
                 || line.contains("Error initializing complex filters")
             {
                 proc_control.kill_all();