From 654ff76ea4eb53ab17a7da139187f6d932981d1c Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 27 Mar 2012 15:24:25 -0400 Subject: [PATCH] CC-3399: Use VBR instead of CBR for Vorbis (OGG) audio streams -Done --- .../pypo/liquidsoap_scripts/ls_lib.liq | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq index e35614625..da34c5ab4 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq @@ -93,27 +93,27 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de source := add(normalize=false, [amplify(0.00001, noise()),s]) end if bitrate == 24 then - ignore(output(%vorbis.cbr(bitrate = 24),!source)) + ignore(output(%vorbis(quality=-0.1),!source)) elsif bitrate == 32 then - ignore(output(%vorbis.cbr(bitrate = 32),!source)) + ignore(output(%vorbis(quality=-0.1),!source)) elsif bitrate == 48 then - ignore(output(%vorbis.cbr(bitrate = 48),!source)) + ignore(output(%vorbis(quality=-0.1),!source)) elsif bitrate == 64 then - ignore(output(%vorbis.cbr(bitrate = 64),!source)) + ignore(output(%vorbis(quality=0),!source)) elsif bitrate == 96 then - ignore(output(%vorbis.cbr(bitrate = 96),!source)) + ignore(output(%vorbis(quality=0.2),!source)) elsif bitrate == 128 then - ignore(output(%vorbis.cbr(bitrate = 128),!source)) + ignore(output(%vorbis(quality=0.4),!source)) elsif bitrate == 160 then - ignore(output(%vorbis.cbr(bitrate = 160),!source)) + ignore(output(%vorbis(quality=0.5),!source)) elsif bitrate == 192 then - ignore(output(%vorbis.cbr(bitrate = 192),!source)) + ignore(output(%vorbis(quality=0.6),!source)) elsif bitrate == 224 then - ignore(output(%vorbis.cbr(bitrate = 224),!source)) + ignore(output(%vorbis(quality=0.7),!source)) elsif bitrate == 256 then - ignore(output(%vorbis.cbr(bitrate = 256),!source)) + ignore(output(%vorbis(quality=0.8),!source)) elsif bitrate == 320 then - ignore(output(%vorbis.cbr(bitrate = 320),!source)) + ignore(output(%vorbis(quality=0.9),!source)) end end else