More testing. #1

run.sh

@@ -99,7 +99,7 @@ if [[ $docker == "true" ]]; then
 			-v "$AUDIO_DIR/playlist":"/var/audio/playlist":ro \
 			-v "$AUDIO_DIR/station":"/var/audio/station":ro \
 			-v "$BASE_DIR/contrib":"/srv/contrib" \
-			-v "$BASE_DIR/tests":"/srv/tests" \			
+			-v "$BASE_DIR/tests":"/srv/tests" \
 			-v "$BASE_DIR/logs":"/srv/logs" \
 			-v "/etc/asound.conf":"/etc/asound.conf" \
 			--mount type=tmpfs,destination=/tmp \

tests/docker/test_docker_analog.sh → tests/docker/test_lqs2_alsa_live_unbuffered.sh

@@ -19,4 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-docker run -it -v /dev/snd:/dev/snd -v "/etc/asound.conf":"/etc/asound.conf" --privileged savonet/liquidsoap:main  liquidsoap 'set("log.level",5)' 'set("frame.audio.size", 15052)' 'set("frame.video.framerate", 0)' 'output.alsa(bufferize=false, input.alsa(bufferize=false))'
\ No newline at end of file
+docker run -it \
+    -v /dev/snd:/dev/snd \
+    -v "/etc/asound.conf":"/etc/asound.conf" \
+    --privileged savonet/liquidsoap:main \
+    liquidsoap 'set("log.level",5)' 'set("frame.audio.size", 15052)' 'set("frame.video.framerate", 0)' 'output.alsa(bufferize=false, input.alsa(bufferize=false))'
\ No newline at end of file

tests/test_alsa_default_file.liq → tests/test_alsa_file.liq

-#!/usr/bin/liquidsoap --verbose
+#!/usr/bin/env liquidsoap
 #
 # Aura Engine (https://gitlab.servus.at/aura/engine)
 #
-# Copyright (C) 2017-2020 - The Aura Engine Team.
+# Copyright (C) 2017-now() - The Aura Engine Team.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

tests/test_alsa_default_live.liq → tests/test_alsa_framesize.liq

@@ -19,13 +19,11 @@
 
 
 set("init.allow_root", true)
-set("init.catch_exn", false)
 set("log.file.path", "../logs/<script>.log")
-set("log.level", 5)
-set("ffmpeg.log.level", 5)
 
+# Set this to the value mentioned in the logs after the first run. Watch the logs and double the value if needed.
+# Find more details here: https://gitlab.servus.at/aura/engine-core/-/blob/master/docs/audio-device-configuration.md
 set("frame.audio.size", 0)
-# set("frame.audio.size", 7526)
+
 set("frame.video.framerate", 0)
-input_analog = input.alsa(id="analog_input", device="default", bufferize=false, start=true, fallible=true)
-output.alsa(id="lineout", device="default", input_analog, bufferize=false, fallible=true)
\ No newline at end of file
+output.alsa(device="default", bufferize=false, input.alsa(device="default", bufferize=false))
\ No newline at end of file

tests/test_alsa_live_buffered.liq

+#!/usr/bin/env liquidsoap
+#
+# Aura Engine (https://gitlab.servus.at/aura/engine)
+#
+# Copyright (C) 2017-now() - The Aura Engine Team.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+set("init.allow_root", true)
+set("init.catch_exn", false)
+set("log.file.path", "../logs/<script>.log")
+set("log.level", 5)
+set("ffmpeg.log.level", 5)
+set("audio.converter.samplerate.converters", ["ffmpeg"])
+
+# Successfully tested with Liquidsoap 1.1.4 & ALSA 1.2.4
+# Low latency, no buffer underruns
+set("frame.audio.size", 2048)
+set("alsa.alsa_buffer", 8192)
+set("alsa.buffer_length", 10)
+
+input_analog = input.alsa(device="default", bufferize=true)
+output.alsa(device="default", input_analog, bufferize=true)
\ No newline at end of file

tests/test_alsa_live_double_buffered.liq

+#!/usr/bin/env liquidsoap
+#
+# Aura Engine (https://gitlab.servus.at/aura/engine)
+#
+# Copyright (C) 2017-now() - The Aura Engine Team.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+set("init.allow_root", true)
+set("init.catch_exn", false)
+set("log.file.path", "../logs/<script>.log")
+set("log.level", 5)
+set("ffmpeg.log.level", 5)
+set("audio.converter.samplerate.converters", ["ffmpeg"])
+
+# Successfully tested with Liquidsoap 1.4.4 + 1.1.3
+# High latency, no buffer underruns
+set("audio.converter.samplerate.converters", ["ffmpeg"])
+set("frame.audio.size", 2048)
+set("alsa.alsa_buffer", 8192)
+set("alsa.buffer_length", 10)
+
+input_analog = input.alsa(device="default", bufferize=true)
+input_analog = mksafe(buffer(input_analog))
+output.alsa(device="default", input_analog, bufferize=true)
\ No newline at end of file

tests/test_framesize.liq → tests/test_alsa_live_unbuffered.liq

@@ -19,8 +19,17 @@
 
 
 set("init.allow_root", true)
+set("init.catch_exn", false)
 set("log.file.path", "../logs/<script>.log")
+set("log.level", 5)
+set("ffmpeg.log.level", 5)
+set("audio.converter.samplerate.converters", ["ffmpeg"])
 
-set("frame.audio.size", 0)
+# Successfully tested with Liquidsoap 2 & ALSA 1.2.4
+# Almost no latency, no buffer underruns
+# Doesn't work in Liquidsoap 1.4 because of some calculation bug
+set("frame.audio.size", 7526)
 set("frame.video.framerate", 0)
-input.alsa(device="default", bufferize=false)
\ No newline at end of file
+
+input_analog = input.alsa(device="default", bufferize=false)
+output.alsa(device="default", input_analog, bufferize=false)
\ No newline at end of file