external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

remove libaacplus.

Browse source
This commit is contained in:
winlin 2015-03-06 22:35:02 +08:00
parent 496f689de7
commit b360fe279d
7 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
trunk/3rdparty/libaacplus-2.0.2.zip vendored
View file

Binary file not shown.

BIN
trunk/3rdparty/libaacplus-patch-26410-800.zip vendored
View file

Binary file not shown.

8
trunk/3rdparty/readme.txt vendored
View file

@ -16,8 +16,6 @@ CherryPy-3.2.4.zip
ffmpeg-2.1.1.tar.gz ffmpeg-2.1.1.tar.gz
yasm-1.2.0.tar.gz yasm-1.2.0.tar.gz
lame-3.99.5.tar.gz lame-3.99.5.tar.gz
libaacplus-2.0.2.tar.gz
libaacplus-patch-26410-800.zip (26410-800.zip)
speex-1.2rc1.zip speex-1.2rc1.zip
x264-snapshot-20131129-2245-stable.tar.bz2 (core.138) x264-snapshot-20131129-2245-stable.tar.bz2 (core.138)
for srs to support live stream transcoding. for srs to support live stream transcoding.
@ -55,12 +53,6 @@ links:
lame: lame:
http://sourceforge.net/projects/lame/ http://sourceforge.net/projects/lame/
http://nchc.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz http://nchc.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz
aacplus:
http://217.20.164.161/~tipok/aacplus/
http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz
aacplus-patch:
http://www.3gpp.org/DynaReport/26410.htm
http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
yasm: yasm:
http://yasm.tortall.net/ http://yasm.tortall.net/
http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz

6
trunk/conf/demo.conf
View file

@ -82,7 +82,7 @@ vhost demo.srs.com {
vpreset superfast; vpreset superfast;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -105,7 +105,7 @@ vhost demo.srs.com {
vpreset fast; vpreset fast;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 40; abitrate 40;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -151,7 +151,7 @@ vhost players {
vparams { vparams {
g 100; g 100;
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 30; abitrate 30;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;

2
trunk/conf/ffmpeg.transcode.conf
View file

@ -22,7 +22,7 @@ vhost __defaultVhost__ {
vpreset medium; vpreset medium;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 70; abitrate 70;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;

27
trunk/conf/full.conf
View file

@ -788,12 +788,11 @@ vhost example.transcode.srs.com {
refs 10; refs 10;
} }
# audio encoder name. can be: # audio encoder name. can be:
# libaacplus: use aac(libaacplus) audio encoder.
# libfdk_aac: use aac(libfdk_aac) audio encoder. # libfdk_aac: use aac(libfdk_aac) audio encoder.
# copy: donot encoder the audio stream, copy it. # copy: donot encoder the audio stream, copy it.
# an: disable audio output. # an: disable audio output.
acodec libaacplus; acodec libfdk_aac;
# audio bitrate, in kbps. [16, 72] for libaacplus. # audio bitrate, in kbps. [16, 72] for libfdk_aac.
abitrate 70; abitrate 70;
# audio sample rate. for flv/rtmp, it must be: # audio sample rate. for flv/rtmp, it must be:
# 44100,22050,11025,5512 # 44100,22050,11025,5512
@ -841,7 +840,7 @@ vhost mirror.transcode.srs.com {
vpreset superfast; vpreset superfast;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -874,7 +873,7 @@ vhost crop.transcode.srs.com {
vpreset superfast; vpreset superfast;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -905,7 +904,7 @@ vhost logo.transcode.srs.com {
vpreset superfast; vpreset superfast;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -925,7 +924,7 @@ vhost audio.transcode.srs.com {
engine acodec { engine acodec {
enabled on; enabled on;
vcodec copy; vcodec copy;
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -944,7 +943,7 @@ vhost vn.transcode.srs.com {
engine vn { engine vn {
enabled on; enabled on;
vcodec vn; vcodec vn;
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -996,7 +995,7 @@ vhost all.transcode.srs.com {
bf 3; bf 3;
refs 10; refs 10;
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 70; abitrate 70;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -1018,7 +1017,7 @@ vhost all.transcode.srs.com {
vpreset medium; vpreset medium;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 70; abitrate 70;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -1038,7 +1037,7 @@ vhost all.transcode.srs.com {
vpreset fast; vpreset fast;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 60; abitrate 60;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -1058,7 +1057,7 @@ vhost all.transcode.srs.com {
vpreset superfast; vpreset superfast;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -1069,7 +1068,7 @@ vhost all.transcode.srs.com {
engine vcopy { engine vcopy {
enabled on; enabled on;
vcodec copy; vcodec copy;
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;
@ -1117,7 +1116,7 @@ vhost ffempty.transcode.srs.com {
vpreset superfast; vpreset superfast;
vparams { vparams {
} }
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;

2
trunk/conf/transcode2hls.audio.only.conf
View file

@ -17,7 +17,7 @@ vhost __defaultVhost__ {
engine ff { engine ff {
enabled on; enabled on;
vcodec copy; vcodec copy;
acodec libaacplus; acodec libfdk_aac;
abitrate 45; abitrate 45;
asample_rate 44100; asample_rate 44100;
achannels 2; achannels 2;