Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force the use of FDK-AAC and significantly boost AAC sound quality

This commit is contained in:
Albert Santoni 2015-01-06 12:58:11 -05:00
parent a0f5e33855
commit fc912923ce
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
python_apps/pypo/liquidsoap_scripts/fdkaac.liq
View File

@ -1,24 +1,24 @@
if bitrate == 24 then 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 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 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 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 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 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 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 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 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 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 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 end

24
python_apps/pypo/liquidsoap_scripts/ls_lib.liq
View File

@ -150,20 +150,22 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
end end
%endif %endif
%ifencoder %aac # FDK-AAC is the only good AAC encoder. libvoaac is deprecated and aacplus is subpar.
if type == "aac" then # The difference in compression quality is clearly audible. -- Albert
%include "aac.liq" # %ifencoder %aac
end # if type == "aac" then
%endif # %include "aac.liq"
# end
# %endif
%ifencoder %aacplus # %ifencoder %aacplus
if type == "aacplus" then # if type == "aacplus" then
%include "aacplus.liq" # %include "aacplus.liq"
end # end
%endif # %endif
%ifencoder %fdkaac %ifencoder %fdkaac
if type == "fdkaac" then if type == "aac" then
%include "fdkaac.liq" %include "fdkaac.liq"
end end
%endif %endif