From 8ac3688d2bd178db9b5a54efa1bde4e688432564 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Mon, 19 Dec 2022 12:26:42 +0100 Subject: [PATCH 1/7] log error only when fdk_aac is in use --- lib/src/utils/mod.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/src/utils/mod.rs b/lib/src/utils/mod.rs index cf13f97e..aece532c 100644 --- a/lib/src/utils/mod.rs +++ b/lib/src/utils/mod.rs @@ -786,12 +786,18 @@ pub fn validate_ffmpeg(config: &mut PlayoutConfig) -> Result<(), String> { ); } - if !config - .general - .ffmpeg_libs - .contains(&"libfdk-aac".to_string()) + if config + .out + .output_cmd + .as_ref() + .unwrap() + .contains(&"libfdk_aac".to_string()) + && !config + .general + .ffmpeg_libs + .contains(&"libfdk-aac".to_string()) { - warn!("ffmpeg contains no libfdk-aac! Can't use high quality aac encoder..."); + error!("ffmpeg contains no libfdk-aac!"); } Ok(()) From 1491f46e3dbb9a4dfa14fe2ab3680c6d0cc89b3d Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Mon, 19 Dec 2022 12:32:07 +0100 Subject: [PATCH 2/7] make libx264 optional --- lib/src/utils/mod.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/src/utils/mod.rs b/lib/src/utils/mod.rs index aece532c..ca16036d 100644 --- a/lib/src/utils/mod.rs +++ b/lib/src/utils/mod.rs @@ -772,7 +772,14 @@ pub fn validate_ffmpeg(config: &mut PlayoutConfig) -> Result<(), String> { ffmpeg_filter_and_libs(config)?; - if !config.general.ffmpeg_libs.contains(&"libx264".to_string()) { + if config + .out + .output_cmd + .as_ref() + .unwrap() + .contains(&"libx264".to_string()) + && !config.general.ffmpeg_libs.contains(&"libx264".to_string()) + { return Err("ffmpeg contains no libx264!".to_string()); } @@ -797,7 +804,7 @@ pub fn validate_ffmpeg(config: &mut PlayoutConfig) -> Result<(), String> { .ffmpeg_libs .contains(&"libfdk-aac".to_string()) { - error!("ffmpeg contains no libfdk-aac!"); + return Err("ffmpeg contains no libfdk-aac!".to_string()); } Ok(()) From 850a48ed43a671e7a0d924510b80592e489fff94 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Mon, 19 Dec 2022 12:39:34 +0100 Subject: [PATCH 3/7] catch empty program list in playlist https://github.com/ffplayout/ffplayout-frontend/issues/101 --- lib/src/utils/json_serializer.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/src/utils/json_serializer.rs b/lib/src/utils/json_serializer.rs index f70f442c..bd0d7295 100644 --- a/lib/src/utils/json_serializer.rs +++ b/lib/src/utils/json_serializer.rs @@ -203,9 +203,15 @@ pub fn read_json( Ok(p) => p, Err(e) => { error!("Playlist file not readable! {e}"); - JsonPlaylist::new(date, start_sec) + JsonPlaylist::new(date.clone(), start_sec) } }; + + // catch empty program list + if playlist.program.is_empty() { + playlist = JsonPlaylist::new(date, start_sec) + } + playlist.modified = modified_time(¤t_file); let list_clone = playlist.clone(); From a3ce014444672704d9c33af6f6105f57c40a544d Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Tue, 20 Dec 2022 09:24:54 +0100 Subject: [PATCH 4/7] update packages, set correct port --- Cargo.lock | 42 ++++++++++++++++++------------------- debian/postinst | 2 +- ffplayout-api/Cargo.toml | 2 +- ffplayout-engine/Cargo.toml | 2 +- ffplayout-frontend | 2 +- lib/Cargo.toml | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 669431ac..0dd98c5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,9 +818,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27874566aca772cb515af4c6e997b5fe2119820bca447689145e39bb734d19a0" +checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" dependencies = [ "cc", "cxxbridge-flags", @@ -830,9 +830,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb951f2523a49533003656a72121306b225ec16a49a09dc6b0ba0d6f3ec3c0" +checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" dependencies = [ "cc", "codespan-reporting", @@ -845,15 +845,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be778b6327031c1c7b61dd2e48124eee5361e6aa76b8de93692f011b08870ab4" +checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" [[package]] name = "cxxbridge-macro" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8a2b87662fe5a0a0b38507756ab66aff32638876a0866e5a5fc82ceb07ee49" +checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" dependencies = [ "proc-macro2", "quote", @@ -962,7 +962,7 @@ dependencies = [ [[package]] name = "ffplayout" -version = "0.16.6" +version = "0.16.7" dependencies = [ "chrono", "clap", @@ -982,7 +982,7 @@ dependencies = [ [[package]] name = "ffplayout-api" -version = "0.8.2" +version = "0.8.3" dependencies = [ "actix-files", "actix-multipart", @@ -1014,7 +1014,7 @@ dependencies = [ [[package]] name = "ffplayout-lib" -version = "0.16.6" +version = "0.16.7" dependencies = [ "chrono", "crossbeam-channel", @@ -2253,18 +2253,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d89e5dba24725ae5678020bf8f1357a9aa7ff10736b551adbcd3f8d17d766f" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d0f47a940e895261e77dc200d5eadfc6ef644c179c6f5edfc105e3a2292c8" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -2491,9 +2491,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bfa246f936730408c0abee392cc1a50b118ece708c7f630516defd64480c7d8" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" @@ -2517,9 +2517,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.90" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8778cc0b528968fe72abec38b5db5a20a70d148116cd9325d2bc5f5180ca3faf" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -2770,9 +2770,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ee3a69cd2c7e06684677e5629b3878b253af05e4714964204279c6bc02cf0b" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", diff --git a/debian/postinst b/debian/postinst index 9fc6ebbe..749b43ec 100644 --- a/debian/postinst +++ b/debian/postinst @@ -13,7 +13,7 @@ if [ ! -d "/usr/share/ffplayout/db" ]; then IP=$(hostname -I | cut -d ' ' -f1) - /usr/bin/ffpapi -i -d $IP + /usr/bin/ffpapi -i -d "${IP}:8787" chown -R ${sysUser}. "/usr/share/ffplayout" chown -R ${sysUser}. "/var/lib/ffplayout" diff --git a/ffplayout-api/Cargo.toml b/ffplayout-api/Cargo.toml index baa21f7c..84e4f9a7 100644 --- a/ffplayout-api/Cargo.toml +++ b/ffplayout-api/Cargo.toml @@ -4,7 +4,7 @@ description = "Rest API for ffplayout" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.8.2" +version = "0.8.3" edition = "2021" [dependencies] diff --git a/ffplayout-engine/Cargo.toml b/ffplayout-engine/Cargo.toml index ca5c86aa..933518d2 100644 --- a/ffplayout-engine/Cargo.toml +++ b/ffplayout-engine/Cargo.toml @@ -4,7 +4,7 @@ description = "24/7 playout based on rust and ffmpeg" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.16.6" +version = "0.16.7" edition = "2021" default-run = "ffplayout" diff --git a/ffplayout-frontend b/ffplayout-frontend index 269d3f03..ceeb44b8 160000 --- a/ffplayout-frontend +++ b/ffplayout-frontend @@ -1 +1 @@ -Subproject commit 269d3f0306a230805f7a19477163631c07bbd0a3 +Subproject commit ceeb44b8828d3dfa50285cdd1b59bb7fc63c9959 diff --git a/lib/Cargo.toml b/lib/Cargo.toml index ac6f3ac7..ccd22e5d 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -4,7 +4,7 @@ description = "Library for ffplayout" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.16.6" +version = "0.16.7" edition = "2021" [dependencies] From 3ddec8cf19db692412c603718038cf3f0ffa7815 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Tue, 20 Dec 2022 10:05:08 +0100 Subject: [PATCH 5/7] update frontend --- ffplayout-frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffplayout-frontend b/ffplayout-frontend index ceeb44b8..64546850 160000 --- a/ffplayout-frontend +++ b/ffplayout-frontend @@ -1 +1 @@ -Subproject commit ceeb44b8828d3dfa50285cdd1b59bb7fc63c9959 +Subproject commit 645468509bc5caee251ce724a56c831521018105 From b812de97470fd21e8734fe6e5282cc0e871384ca Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Tue, 20 Dec 2022 10:16:44 +0100 Subject: [PATCH 6/7] suppress 408 --- ffplayout-frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffplayout-frontend b/ffplayout-frontend index 64546850..72ebb909 160000 --- a/ffplayout-frontend +++ b/ffplayout-frontend @@ -1 +1 @@ -Subproject commit 645468509bc5caee251ce724a56c831521018105 +Subproject commit 72ebb909a9c035a301c8ebf2e7f036756e9d129f From 7d0e82a17cb27d09451a5b8ee64265d2d590d562 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Tue, 20 Dec 2022 10:26:36 +0100 Subject: [PATCH 7/7] update to v0.16.7 --- CHANGELOG.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 924dd797..8c422cdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,32 @@ # Changelog -## [0.16.6](https://github.com/ffplayout/ffplayout/compare/v0.16.5...v0.1665) (2022-12-17) +## [0.16.6](https://github.com/ffplayout/ffplayout/compare/v0.16.6...v0.16.7) (2022-12-20) ### ffplayout + +- log error only when fdk_aac is in use [8ac3688](https://github.com/ffplayout/ffplayout/pull/249/commits/8ac3688d2bd178db9b5a54efa1bde4e688432564) +- make libx264 optional [1491f46](https://github.com/ffplayout/ffplayout/pull/249/commits/1491f46e3dbb9a4dfa14fe2ab3680c6d0cc89b3d) +- catch empty program list in [#101](playlist https://github.com/ffplayout/ffplayout-frontend/issues/101) [850a48e](https://github.com/ffplayout/ffplayout/pull/249/commits/850a48ed43a671e7a0d924510b80592e489fff94) +- update packages, set correct port [a3ce014](https://github.com/ffplayout/ffplayout/pull/249/commits/a3ce014444672704d9c33af6f6105f57c40a544d) + +### frontend + +- remove dotenv, update packages [3ddec8c](https://github.com/ffplayout/ffplayout/pull/249/commits/3ddec8cf19db692412c603718038cf3f0ffa7815), should fix [#101](playlist https://github.com/ffplayout/ffplayout-frontend/issues/101) +- suppress 408 error [b812de9](https://github.com/ffplayout/ffplayout/pull/249/commits/b812de97470fd21e8734fe6e5282cc0e871384ca) + +## [0.16.6](https://github.com/ffplayout/ffplayout/compare/v0.16.5...v0.16.6) (2022-12-17) + +### ffplayout + - add logo scale - add optional ingest_level - set windows title in desktop mode [f388820](https://github.com/ffplayout/ffplayout/commit/f38882032f809f094cef895beff07582f0fe9b8f) ### Development + - migrate to Rust 1.66.0 [f388820](https://github.com/ffplayout/ffplayout/commit/f38882032f809f094cef895beff07582f0fe9b8f) - update packages [f388820](https://github.com/ffplayout/ffplayout/commit/f38882032f809f094cef895beff07582f0fe9b8f) - + ## [0.16.5](https://github.com/ffplayout/ffplayout/compare/v0.16.4...v0.16.5) (2022-11-28) ### ffpapi