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

Merge pull request #6 from ffplayout/master

Browse Source 
fix player control in HLS mode
This commit is contained in:
jb-alvarado 2023-06-25 17:26:18 +00:00 committed by GitHub
commit c03e44e968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,5 +1,12 @@
# Changelog # Changelog
## [0.18.4](https://github.com/ffplayout/ffplayout/releases/tag/v0.18.4) (2023-06-25)
### ffplayout
- fix player control in HLS Mode [ec33cdb](https://github.com/ffplayout/ffplayout/commit/ec33cdb30944ab19c028a085fcb6d974ec4e81be)
## [0.18.3](https://github.com/ffplayout/ffplayout/releases/tag/v0.18.3) (2023-06-16) ## [0.18.3](https://github.com/ffplayout/ffplayout/releases/tag/v0.18.3) (2023-06-16)
### ffpapi ### ffpapi

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

@ -186,7 +186,7 @@ pub fn write_hls(
enc_cmd.join(" ") enc_cmd.join(" ")
); );
let mut enc_proc = match Command::new("ffmpeg") let mut dec_proc = match Command::new("ffmpeg")
.args(enc_cmd) .args(enc_cmd)
.stderr(Stdio::piped()) .stderr(Stdio::piped())
.spawn() .spawn()
@ -198,8 +198,8 @@ pub fn write_hls(
Ok(proc) => proc, Ok(proc) => proc,
}; };
let enc_err = BufReader::new(enc_proc.stderr.take().unwrap()); let enc_err = BufReader::new(dec_proc.stderr.take().unwrap());
*proc_control.encoder_term.lock().unwrap() = Some(enc_proc); *proc_control.decoder_term.lock().unwrap() = Some(dec_proc);
if let Err(e) = stderr_reader(enc_err, Encoder, proc_control.clone()) { if let Err(e) = stderr_reader(enc_err, Encoder, proc_control.clone()) {
error!("{e:?}") error!("{e:?}")