From ac8917e3fca7c49d2e80db187c55453b62f36670 Mon Sep 17 00:00:00 2001 From: jo Date: Wed, 1 Mar 2023 15:58:44 +0100 Subject: [PATCH] fix(playout): explicit ogg vorbis icecast encoder --- .../libretime_playout/liquidsoap/templates/outputs.liq.j2 | 4 ++-- .../tests/liquidsoap/__snapshots__/entrypoint_test.ambr | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/playout/libretime_playout/liquidsoap/templates/outputs.liq.j2 b/playout/libretime_playout/liquidsoap/templates/outputs.liq.j2 index 5f75d5abf..42ebaac90 100644 --- a/playout/libretime_playout/liquidsoap/templates/outputs.liq.j2 +++ b/playout/libretime_playout/liquidsoap/templates/outputs.liq.j2 @@ -9,10 +9,10 @@ 32: "-0.1", 48: "-0.1", 64: "0", 96: "0.2", 128: "0.4", 160: "0.5", 192: "0.6", 224: "0.7", 256: "0.8", 320: "0.9", } -%} -%vorbis( +%ogg(%vorbis( quality={{ quality_mapping[audio.bitrate] }}, channels={{ 2 if audio.channels == "stereo" else 1 }} -) +)) {%- elif audio.format == "mp3" -%} %mp3( diff --git a/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr b/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr index d135afab2..e8d74e9f8 100644 --- a/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr +++ b/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr @@ -85,10 +85,10 @@ url="https://libretime.org", on_connect=make_ouput_on_connect_handler("1"), on_error=make_ouput_on_error_handler("1"), - %vorbis( + %ogg(%vorbis( quality=0.8, channels=2 - ), + )), output_icecast_1_source, ) @@ -205,10 +205,10 @@ url="", on_connect=make_ouput_on_connect_handler("1"), on_error=make_ouput_on_error_handler("1"), - %vorbis( + %ogg(%vorbis( quality=0.8, channels=2 - ), + )), output_icecast_1_source, )