From 95cdc7be62b273c6dbe4e4a5d0c6c50218148d46 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Mon, 28 Mar 2022 18:27:28 +0200 Subject: [PATCH 1/5] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 4e4fe0cf..93f1c042 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,9 @@ [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) +## Attention: +Soon this code willbe merged in [ffplayout_engine](https://github.com/ffplayout/ffplayout_engine) + The main purpose of ffplayout is to provide a 24/7 broadcasting solution that plays a *json* playlist for every day, while keeping the current playlist editable. **Check [ffplayout-frontend](https://github.com/ffplayout/ffplayout-frontend): web-based GUI for ffplayout** From 5e849a3ddcc107728b1b1f90dfc0bb1c865932ed Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Mon, 28 Mar 2022 18:28:01 +0200 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 93f1c042..77e38116 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) -## Attention: +**Attention:** Soon this code willbe merged in [ffplayout_engine](https://github.com/ffplayout/ffplayout_engine) The main purpose of ffplayout is to provide a 24/7 broadcasting solution that plays a *json* playlist for every day, while keeping the current playlist editable. From 381ee55d1377dc8aa27b0371b781d00491b73595 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Thu, 31 Mar 2022 21:37:02 +0200 Subject: [PATCH 3/5] delete archive when exists --- cross_compile_all.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cross_compile_all.sh b/cross_compile_all.sh index a82d41a1..17900ecd 100755 --- a/cross_compile_all.sh +++ b/cross_compile_all.sh @@ -20,10 +20,18 @@ for target in "${targets[@]}"; do cargo build --release --target=$target if [[ $target == "x86_64-pc-windows-gnu" ]]; then + if [[ -f "ffplayout-rs-v${version}_${target}.zip" ]]; then + rm -f "ffplayout-rs-v${version}_${target}.zip" + fi + cp ./target/${target}/release/ffplayout.exe . - zip "ffplayout-rs-v${version}_${target}.zip" assets docs LICENSE README.md ffplayout.exe + zip -r "ffplayout-rs-v${version}_${target}.zip" assets docs LICENSE README.md ffplayout.exe rm -f ffplayout.exe else + if [[ -f "ffplayout-rs-v${version}_${target}.tar.gz" ]]; then + rm -f "ffplayout-rs-v${version}_${target}.tar.gz" + fi + cp ./target/${target}/release/ffplayout . tar -czvf "ffplayout-rs-v${version}_${target}.tar.gz" assets docs LICENSE README.md ffplayout rm -f ffplayout From a76dde7e125cf1acb7b664b84a46c0db88967391 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Thu, 31 Mar 2022 21:46:33 +0200 Subject: [PATCH 4/5] updates --- Cargo.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1440ded7..946dff47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.6" +version = "3.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" +checksum = "c67e7973e74896f4bba06ca2dcfd28d54f9cb8c035e940a32b88ed48f5f5ecf2" dependencies = [ "atty", "bitflags", @@ -96,9 +96,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.4" +version = "3.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16" +checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" dependencies = [ "heck", "proc-macro-error", @@ -355,9 +355,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown", @@ -555,9 +555,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bf6f32a3afefd0b587ee42ed19acd945c6d1f3b5424040f50b2f24ab16be77" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" dependencies = [ "lazy_static", "libc", @@ -717,9 +717,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "ppv-lite86" @@ -817,9 +817,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae183fc1b06c149f0c1793e1eb447c8b04bfe46d48e9e48bfb8d2d7ed64ecf0" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] @@ -973,9 +973,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" +checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f" dependencies = [ "proc-macro2", "quote", From c4298267b5b8dd5ab2f75636f84bed22bab35573 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Thu, 31 Mar 2022 22:09:22 +0200 Subject: [PATCH 5/5] add infos about hls output --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index 77e38116..3762fe3c 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ The main purpose of ffplayout is to provide a 24/7 broadcasting solution that pl - output: - **stream** - **desktop** + - **HLS** Requirements ----- @@ -105,6 +106,26 @@ But be careful with it, better test it multiple times! More informations in [Wiki](https://github.com/ffplayout/ffplayout_engine/wiki/Remote-URL-Source) +HLS output +----- + +For outputting to HLS, output parameters should look like: + +```yaml +out: + ... + + output_param: >- + ... + + -flags +cgop + -f hls + -hls_time 6 + -hls_list_size 600 + -hls_flags append_list+delete_segments+omit_endlist+program_date_time + -hls_segment_filename /var/www/html/live/stream-%09d.ts /var/www/html/live/stream.m3u8 +``` + Installation -----