djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename hls process

Browse Source
This commit is contained in:
jb-alvarado 2022-10-05 20:44:44 +02:00
parent c3b57622bb
commit 8a5889be37
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ffplayout-engine/src/output/hls.rs
View File

@ -30,7 +30,7 @@ use simplelog::*;
use crate::input::{ingest::log_line, source_generator}; use crate::input::{ingest::log_line, source_generator};
use ffplayout_lib::filter::filter_chains; use ffplayout_lib::filter::filter_chains;
use ffplayout_lib::utils::{ use ffplayout_lib::utils::{
prepare_output_cmd, sec_to_time, stderr_reader, test_tcp_port, Decoder, Ingest, Media, prepare_output_cmd, sec_to_time, stderr_reader, test_tcp_port, Encoder, Ingest, Media,
PlayerControl, PlayoutConfig, PlayoutStatus, ProcessControl, PlayerControl, PlayoutConfig, PlayoutStatus, ProcessControl,
}; };
use ffplayout_lib::vec_strings; use ffplayout_lib::vec_strings;
@ -124,7 +124,7 @@ fn ingest_to_hls_server(
info!("Switch from {} to live ingest", config.processing.mode); info!("Switch from {} to live ingest", config.processing.mode);
if let Err(e) = proc_control.kill(Decoder) { if let Err(e) = proc_control.kill(Encoder) {
error!("{e}"); error!("{e}");
} }
} }
@ -218,20 +218,20 @@ pub fn write_hls(
.spawn() .spawn()
{ {
Err(e) => { Err(e) => {
error!("couldn't spawn decoder process: {e}"); error!("couldn't spawn encoder process: {e}");
panic!("couldn't spawn decoder process: {e}") panic!("couldn't spawn encoder process: {e}")
} }
Ok(proc) => proc, Ok(proc) => proc,
}; };
let dec_err = BufReader::new(enc_proc.stderr.take().unwrap()); let enc_err = BufReader::new(enc_proc.stderr.take().unwrap());
*proc_control.decoder_term.lock().unwrap() = Some(enc_proc); *proc_control.encoder_term.lock().unwrap() = Some(enc_proc);
if let Err(e) = stderr_reader(dec_err, "Writer", proc_control.clone()) { if let Err(e) = stderr_reader(enc_err, "Writer", proc_control.clone()) {
error!("{e:?}") error!("{e:?}")
}; };
if let Err(e) = proc_control.wait(Decoder) { if let Err(e) = proc_control.wait(Encoder) {
error!("{e}"); error!("{e}");
} }