Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-4417: Opus codec support

This commit is contained in:
Martin Konecny 2013-04-26 17:54:29 -04:00
parent 21bed91678
commit 3a931f27bf
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
airtime_mvc/application/controllers/PreferenceController.php
View File

@ -164,16 +164,25 @@ class PreferenceController extends Zend_Controller_Action
foreach ($temp as $t) { foreach ($temp as $t) {
$setting[$t['keyname']] = $t['value']; $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 // get predefined type and bitrate from pref table
$temp_types = Application_Model_Preference::GetStreamType(); $temp_types = Application_Model_Preference::GetStreamType();
$stream_types = array(); $stream_types = array();
foreach ($temp_types as $type) { foreach ($temp_types as $type) {
if (trim($type) == "ogg") { $type = strtolower(trim($type));
$temp = "OGG/VORBIS"; if (isset($name_map[$type])) {
$name = $name_map[$type];
} else { } else {
$temp = strtoupper(trim($type)); $name = $type;
} }
$stream_types[trim($type)] = $temp; $stream_types[$type] = $name;
} }
$temp_bitrate = Application_Model_Preference::GetStreamBitrate(); $temp_bitrate = Application_Model_Preference::GetStreamBitrate();

2
airtime_mvc/build/sql/defaultdata.sql
View File

@ -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 -- end of added in 2.1
-- added in 2.0.0 -- 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('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('num_of_streams', '3');
INSERT INTO cc_pref("keystr", "valstr") VALUES('max_bitrate', '320'); INSERT INTO cc_pref("keystr", "valstr") VALUES('max_bitrate', '320');

2
install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql
View File

@ -2,4 +2,4 @@ DELETE FROM cc_pref WHERE keystr = 'system_version';
INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.4.0'); INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.4.0');
DELETE FROM cc_pref WHERE keystr = 'stream_type'; 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');