diff --git a/python_apps/pypo/liquidsoap_scripts/fdkaac.liq b/python_apps/pypo/liquidsoap_scripts/fdkaac.liq index 0c6945221..d1746e097 100644 --- a/python_apps/pypo/liquidsoap_scripts/fdkaac.liq +++ b/python_apps/pypo/liquidsoap_scripts/fdkaac.liq @@ -1,24 +1,24 @@ if bitrate == 24 then - ignore(output_stereo(%fdkaac(bitrate = 24, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 24, aot="mpeg4_he_aac_v2", afterburner=false, sbr_mode=true), !source)) elsif bitrate == 32 then - ignore(output_stereo(%fdkaac(bitrate = 32, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 32, aot="mpeg4_he_aac_v2", afterburner=false, sbr_mode=true), !source)) elsif bitrate == 48 then - ignore(output_stereo(%fdkaac(bitrate = 48, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 48, aot="mpeg4_he_aac_v2", afterburner=false, sbr_mode=true), !source)) elsif bitrate == 64 then - ignore(output_stereo(%fdkaac(bitrate = 64, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 64, aot="mpeg4_he_aac_v2", afterburner=false, sbr_mode=true), !source)) elsif bitrate == 96 then - ignore(output_stereo(%fdkaac(bitrate = 96, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 96, aot="mpeg4_he_aac_v2", afterburner=false, sbr_mode=true), !source)) elsif bitrate == 128 then - ignore(output_stereo(%fdkaac(bitrate = 128, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 128, aot="mpeg4_he_aac_v2", afterburner=false, sbr_mode=true), !source)) elsif bitrate == 160 then - ignore(output_stereo(%fdkaac(bitrate = 160, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 160, aot="mpeg4_he_aac_v2", afterburner=true, sbr_mode=true), !source)) elsif bitrate == 192 then - ignore(output_stereo(%fdkaac(bitrate = 192, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 192, aot="mpeg4_he_aac_v2"), afterburner=true, sbr_mode=true, !source)) elsif bitrate == 224 then - ignore(output_stereo(%fdkaac(bitrate = 224, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 224, aot="mpeg4_he_aac_v2"), afterburner=true, sbr_mode=true, !source)) elsif bitrate == 256 then - ignore(output_stereo(%fdkaac(bitrate = 256, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 256, aot="mpeg4_he_aac_v2"), afterburner=true, sbr_mode=true, !source)) elsif bitrate == 320 then - ignore(output_stereo(%fdkaac(bitrate = 320, aot="mpeg4_he_aac_v2"), !source)) + ignore(output_stereo(%fdkaac(bitrate = 320, aot="mpeg4_he_aac_v2"), afterburner=true, sbr_mode=true, !source)) end diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq index e4459600d..0646bf6b6 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq @@ -150,20 +150,22 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de end %endif - %ifencoder %aac - if type == "aac" then - %include "aac.liq" - end - %endif +# FDK-AAC is the only good AAC encoder. libvoaac is deprecated and aacplus is subpar. +# The difference in compression quality is clearly audible. -- Albert +# %ifencoder %aac +# if type == "aac" then +# %include "aac.liq" +# end +# %endif - %ifencoder %aacplus - if type == "aacplus" then - %include "aacplus.liq" - end - %endif +# %ifencoder %aacplus +# if type == "aacplus" then +# %include "aacplus.liq" +# end +# %endif %ifencoder %fdkaac - if type == "fdkaac" then + if type == "aac" then %include "fdkaac.liq" end %endif