From eeb73b72060afba9a13ee7af449dc6f1e6377eb0 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 31 May 2013 15:59:04 -0400
Subject: [PATCH] CC-5199 aacencplus encoder is very low quality

---
 .../controllers/PreferenceController.php      |  7 +++---
 .../pypo/liquidsoap_scripts/fdkaac.liq        | 24 +++++++++++++++++++
 .../pypo/liquidsoap_scripts/ls_lib.liq        |  6 +++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 python_apps/pypo/liquidsoap_scripts/fdkaac.liq

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 40755d558..d7da8e3de 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -168,11 +168,12 @@ class PreferenceController extends Zend_Controller_Action
             $setting[$t['keyname']] = $t['value'];
         }
 
-        $name_map = array('ogg' => 'Ogg Vorbis',
-                'aacplus' => 'AAC+',
+        $name_map = array(
+				'ogg' => 'Ogg Vorbis',
+                'fdkaac' => 'AAC+',
                 'aac' => 'AAC',
                 'opus' => 'Opus',
-                'mp3' => 'MP3'
+                'mp3' => 'MP3',
         );
 
         // get predefined type and bitrate from pref table
diff --git a/python_apps/pypo/liquidsoap_scripts/fdkaac.liq b/python_apps/pypo/liquidsoap_scripts/fdkaac.liq
new file mode 100644
index 000000000..491606802
--- /dev/null
+++ b/python_apps/pypo/liquidsoap_scripts/fdkaac.liq
@@ -0,0 +1,24 @@
+            if bitrate == 24 then 
+                ignore(output_stereo(%fdkaac(bitrate = 24), !source))
+            elsif bitrate == 32 then
+                ignore(output_stereo(%fdkaac(bitrate = 32), !source))
+            elsif bitrate == 48 then
+                ignore(output_stereo(%fdkaac(bitrate = 48), !source))
+            elsif bitrate == 64 then
+                ignore(output_stereo(%fdkaac(bitrate = 64), !source))
+            elsif bitrate == 96 then
+                ignore(output_stereo(%fdkaac(bitrate = 96), !source))
+            elsif bitrate == 128 then
+                ignore(output_stereo(%fdkaac(bitrate = 128), !source))
+            elsif bitrate == 160 then
+                ignore(output_stereo(%fdkaac(bitrate = 160), !source))
+            elsif bitrate == 192 then
+                ignore(output_stereo(%fdkaac(bitrate = 192), !source))
+            elsif bitrate == 224 then
+                ignore(output_stereo(%fdkaac(bitrate = 224), !source))
+            elsif bitrate == 256 then
+                ignore(output_stereo(%fdkaac(bitrate = 256), !source))
+            elsif bitrate == 320 then
+                ignore(output_stereo(%fdkaac(bitrate = 320), !source))
+            end
+
diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
index a1fb07a38..d9dc3469d 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
@@ -146,6 +146,12 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
             %include "aacplus.liq"
         end
         %endif
+
+        %ifencoder %fdkaac
+        if type == "fdkaac" then
+            %include "fdkaac.liq"
+        end
+        %endif
     else
         user_ref = ref user
         if user == "" then