From 3a931f27bfb3f65702b537d520713b136824b400 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 26 Apr 2013 17:54:29 -0400 Subject: [PATCH] CC-4417: Opus codec support --- .../controllers/PreferenceController.php | 17 +++++++++++++---- airtime_mvc/build/sql/defaultdata.sql | 2 +- .../upgrades/airtime-2.4.0/data/upgrade.sql | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 77f615528..0ccb348a3 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -164,16 +164,25 @@ class PreferenceController extends Zend_Controller_Action foreach ($temp as $t) { $setting[$t['keyname']] = $t['value']; } + + $name_map = array('ogg' => 'Ogg Vorbis', + 'aacplus' => 'AAC+', + 'aac' => 'AAC', + 'opus' => 'Opus', + 'mp3' => 'MP3' + ); + // get predefined type and bitrate from pref table $temp_types = Application_Model_Preference::GetStreamType(); $stream_types = array(); foreach ($temp_types as $type) { - if (trim($type) == "ogg") { - $temp = "OGG/VORBIS"; + $type = strtolower(trim($type)); + if (isset($name_map[$type])) { + $name = $name_map[$type]; } else { - $temp = strtoupper(trim($type)); + $name = $type; } - $stream_types[trim($type)] = $temp; + $stream_types[$type] = $name; } $temp_bitrate = Application_Model_Preference::GetStreamBitrate(); diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql index ff4fe2d6b..ce1620f46 100644 --- a/airtime_mvc/build/sql/defaultdata.sql +++ b/airtime_mvc/build/sql/defaultdata.sql @@ -11,7 +11,7 @@ INSERT INTO cc_live_log("state", "start_time") VALUES('S', now() at time zone 'U -- end of added in 2.1 -- added in 2.0.0 -INSERT INTO cc_pref("keystr", "valstr") VALUES('stream_type', 'ogg, mp3, opus'); +INSERT INTO cc_pref("keystr", "valstr") VALUES('stream_type', 'ogg, mp3, opus, aac'); INSERT INTO cc_pref("keystr", "valstr") VALUES('stream_bitrate', '24, 32, 48, 64, 96, 128, 160, 192, 224, 256, 320'); INSERT INTO cc_pref("keystr", "valstr") VALUES('num_of_streams', '3'); INSERT INTO cc_pref("keystr", "valstr") VALUES('max_bitrate', '320'); diff --git a/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql index aad478aa0..4b091c618 100644 --- a/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql @@ -2,4 +2,4 @@ DELETE FROM cc_pref WHERE keystr = 'system_version'; INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.4.0'); DELETE FROM cc_pref WHERE keystr = 'stream_type'; -INSERT INTO cc_pref (keystr, valstr) VALUES ('stream_type', 'ogg, mp3, opus'); +INSERT INTO cc_pref (keystr, valstr) VALUES ('stream_type', 'ogg, mp3, opus, aac');